lots of additions
Merge branch 'master' of github.com:crooy/dotfiles