Merge branch 'master' of github:DanThomson/dotfiles
Merging remote into local