Merge branch 'cmake' of https://github.com/BVLC/caffe into cmake

Conflicts:
	.travis.yml
	CMakeLists.txt
	CMakeScripts/FindSnappy.cmake
	src/caffe/CMakeLists.txt
	src/caffe/test/CMakeLists.txt