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