cleanup branches
Merge branch 'master' of https://github.com/manuelvanrijn/.dotfiles
Merge branch 'master' of https://github.com/manuelvanrijn/.dotfiles