Switched to Mac
Merge branch 'opencl_support' into GPU, swith to Mac

Conflicts:
	convnet/util.h