Removed an emacs buffer file. Fixed curriculum vitae due to merge error.
Merge branch 'master' into gh-pages
Fixed a couple typos