Fix flymake faces and resolve conflict with color-theme
Add a automode rule for reST
Rename emacs/emacs to emacs/emacs.el

Need to run 'make install-emacs' after pulling this commit.