Removes emacs swap file and amends .gitignore to ignore them in future.
Merge branch 'master' into develop