updated conf emacs file
Merge branch 'master' of https://github.com/iambumblehead/scroungejs