Configuration
Merge branch 'master' of https://github.com/justmytwospence/dotfiles

* 'master' of https://github.com/justmytwospence/dotfiles:
  Configuration