Complete merge
Merge branch 'master' of github.com:cpjobling/my-dotfiles