sometimes, there just isn't a git function in the shell. i don't want to see
grossness
Merge branch 'master' of github.com:nod/dotfiles