[fix] check solver prototxt parsing
Merge pull request #1226 from longjon/check-solver-prototxt

[fix] check solver prototxt parsing
[example] fix data script paths for flickr fine-tuning
local configurations for mpi
seems good
Merge remote-tracking branch 'xiong/mpi_parallel' into mpi_parallel
mpi config changes
Changed Makefile to incorporate MPI settings
[example] add LeNet to MNIST title, fix paths to be from root
[example] re-title LeNet / MNIST heading too
[docs] update homebrew instructions for boost and boost-python split
[docs] note boost 1.56 an CUDA conflict on OS X
Merge pull request #7 from BVLC/master

from master fork
before merge new original caffe
Merge branch 'master' into mpi_parallel
Merge pull request #5 from yjxiong/mpi_parallel

Mpi parallel