Remove activation option from Linear, Conv

[albertz]

I think it would be more clear and explicit if we use the activation functions (relu, tanh, whatever) directly instead of using the activation option.