Cleaning up some of the settings files
Need to merge Merge branch 'master' of https://github.com/santhoshkris/emacs