Start working towards a working git subtree merge script
Merge branch 'master' of github.com:tylert/dotfiles