Merge branch 'add_caffe' into 'master'

Update from-scratch.sh to install caffe on Python 2.7 and Linux

Fixes #27 

See merge request !25

install/from-scratch.sh

@@ -62,7 +62,10 @@ ${CONDA} create --yes -n ${NAME} --override-channels -c conda-forge -c defaults
   tensorflow \
   virtualenv \
   vlfeat
-  #caffe
+
+if [ "$(uname)" == "Linux" ] && [ ${PYTHON_VERSION} == "2.7" ]; then
+    ${CONDA} install --yes -n ${NAME} --override-channels -c conda-forge -c defaults caffe
+fi
 
 echo "[>>] Pip-installing extra dependencies in environment ${NAME} for ${PYTHON_VERSION}..."
 source ${BASEDIR}/bin/activate ${NAME}