Added emacs scratch file to .gitignore
Merge branch 'efp' of github.com:weverett/nwchem6.1.1 into efp