editing on multiple machines sucks sometimes
Merge branch 'master' of https://github.com/stphndemos/dotfiles