Back-merge fixes + docs

and other fixes and documentation updates.

diff --cc Makefile.config.example
Simple merge

diff --cc docs/installation.md
Simple merge

diff --cc python/caffe/_caffe.cpp
Simple merge

diff --cc python/caffe/_caffe.hpp
Simple merge