Back-merge documentation and fixes

diff --cc docs/index.md
index 333f5f7,b8e58cf..0450ede
--- 1/docs/index.md
--- 2/docs/index.md
+++ b/docs/index.md
@@@ -96,4 -94,4 +96,4 @@@ All development discussion should be ca
  If you have a proposal that may not be suited for public discussion *and an ability to act on it*, please email us [directly](mailto:caffe-dev@googlegroups.com).
  Requests for features, explanations, or personal help will be ignored; post such matters publicly as issues.
  
--Some developers may be able to provide [consulting services](mailto:caffe-coldpress@googlegroups.com) for appropriate projects.
++The core Caffe developers may be able to provide [consulting services](mailto:caffe-coldpress@googlegroups.com) for appropriate projects.

diff --cc examples/imagenet/readme.md
index 2273c87,734ce74..ec2a39b
--- 1/examples/imagenet/readme.md
--- 2/examples/imagenet/readme.md
+++ b/examples/imagenet/readme.md
@@@ -41,7 -41,7 +41,8 @@@ You may want to resize the images to 25
  
  Go to `$CAFFE_ROOT/examples/imagenet/` for the rest of this guide.
  
- Take a look at `create_imagenet.sh`. Set the paths to the train and val dirs as needed, and set "RESIZE=true" to resize all images to 256x256 if you haven't resized the images in advance. Now simply create the leveldbs with `./create_imagenet.sh`. Note that `ilsvrc12_train_leveldb` and `ilsvrc12_val_leveldb` should not exist before this execution. It will be created by the script. `GLOG_logtostderr=1` simply dumps more information for you to inspect, and you can safely ignore it.
 -Take a look at `create_imagenet.sh`. Set the paths to the train and val dirs as needed. Now simply create the leveldbs with `./create_imagenet.sh`. Note that `ilsvrc12_train_leveldb` and `ilsvrc12_val_leveldb` should not exist before this execution. It will be created by the script. `GLOG_logtostderr=1` simply dumps more information for you to inspect, and you can safely ignore it.
++Take a look at `create_imagenet.sh`. Set the paths to the train and val dirs as needed, and set "RESIZE=true" to resize all images to 256x256 if you haven't resized the images in advance.
++Now simply create the leveldbs with `./create_imagenet.sh`. Note that `ilsvrc12_train_leveldb` and `ilsvrc12_val_leveldb` should not exist before this execution. It will be created by the script. `GLOG_logtostderr=1` simply dumps more information for you to inspect, and you can safely ignore it.
  
  Compute Image Mean
  ------------------