Merge pull request #2 from bcotton/master

Start the emacs-server on emacs startup