Added support for OSX
Cleaned up emacs files