A multitude of changes…
 - Reinstated p4merge as my merge/diff tool
 - added syntastic and surround vim bundles
 - added gitflush alias
 - a couple other gitconfig additions to help with rebasing