project file
stash local changed before merging with upstream
various changes to vimrc.local
use silver searcher instead of Ack
gonna use this even though it's not working
add completion for vagrant
fix syntax errors
global gitignore
use rbenv for ruby