Updates to emacs template.

This pull request makes the Emacs version follow the conventions used by the Vim theme---bas0X names---along with including many more faces.