various changes
Merge branch 'master' of github.com:daedelus-j/dotfiles
Merge branch 'master' of github.com:daedelus-j/dotfiles
moar
merge with master