merge?
Merge branch 'master' of https://github.com/jtmkrueger/dotfiles
 documentation and a couple new additions