Moved google-specific vim settings to separate file
Added --color=auto to grep
Reverted statusline for now.  Removed underlining from git deletions since sometimes the marker is an overline