* Added slime back into the project
* Fixed a keybinding used to open the .emacs file (wrong location)
Merge branch 'master' of github.com:jmquigley/emacs