Merge
Merge from master
Merge
Merge branch 'macbook' of github.com:zorfling/dotfiles into macbook
Remove simple push
Merge
Merge branch 'macbook' of github.com:zorfling/dotfiles into macbook