Reenable strip trailing whitespace
Fix buffer swapping in NerdTree, move buftabs to status line and add highlight
Merge
Merge branch 'macbook' of github.com:zorfling/dotfiles into macbook
Remove simple push