Bug fixes.
Merge branch 'boost-eigen' of github.com:kmatzen/caffe into boost-eigen