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

[fix] check solver prototxt parsing
added emacs backup files to ignore list
Merge branch 'master' of github.com:BVLC/caffe into brody