lots
Merge branch 'master' of https://github.com/DanThomson/dotfiles
Merge because of null changes on other machine