Random stuff
Merge branch 'master' of github.com:nfelger/dotfiles