Use vimdiff as the git diff tool
Update the autovirtualenv plugin to scan parent paths
Add powerline directory