Added emacs to the base system.
Merge pull request #13 from kueda/master

Added emacs to the base system.