cosmetics: add syntax = proto2
Merge pull request #730 from Yangqing/sweep

cosmetics: add syntax = proto2
use /usr instead of /usr/local for default Python include/lib

This makes the default settings usable with Travis/Ubuntu Python
Travis builds pycaffe
Merge pull request #732 from longjon/travis-pycaffe

Have Travis build pycaffe
More namespace cleaning.
remove 2 using per jeff's comment
fixing std::min and std::max and std::abs: using them in default will make nvcc unhappy.
lint
added solver switch support; implemented nesterov and adagrad
More namespace cleaning.
fixing std::min and std::max and std::abs: using them in default will make nvcc unhappy.
lint
typo fix
wrong function call
Merge branch 'solvers' into dev

Conflicts:
	src/caffe/layers/relu_layer.cpp