some updates
Merge branch 'master' of github.com:rjpower/fastnet

Conflicts:
	cudaconv2/__init__.py
	fastnet/cuda_kernel.py
	fastnet/net.py