Updated to remove x flag, annoys me.
Merge branch 'master' of github.com:LuminousMonkey/.emacs.d