probably should do this
Merge branch 'master' of https://github.com/csherland/dotfiles