moved some stuff around
Merge branch 'master' of github.com:alanzoppa/dotfiles