Removed an emacs buffer file. Fixed curriculum vitae due to merge error.