Added a check for ~/.macosxrc to source Mac OSX things.
Replaced vimdiff with colordiff for my p4 diff tool.
Fixed a bug: vpm wasn't updating submodules

Turns out I needed to manually run a git pull on each submodule.
Luckily there is 'git submodule foreach'