Use the simple push scheme for git
expandtab in vimrc will replace tabs with tabstop number of spaces.
Merge branch 'master' of github.com:bwkeller/env