Updated Pathogen to 2.2.
Merge branch 'master' into mac
Cleaned up vimrc and fixed colorscheme (removed from gvimrc).
Added Wombat and Moria colours.
Merge branch 'master' into mac

Conflicts:
	gvimrc