Merge pull request #33 from milkypostman/master

Updates to emacs template.
fix bug with hl-line overriding foreground color