Refactor a bit
Merge branch 'master' of github.com:jmeagher/dotfiles