moved stuff around and fixed annoying bugs in my setup
Merge branch 'master' of https://github.com/madsobitsoe/.emacs.d
merge