* ARGGGHHH.  forgot to add 'em.
Merge branch 'master' of https://github.com/hartzell/emacs24-starter-kit