Default to rebase
Don't rebalance window sizes
Highlight trailing whitespace and delete it on write
Merge branch 'master' of github.com:jhwist/Dotfiles