Adjusting perforce commands.
Merge branch 'master' into avalanche

Conflicts:
	vimrc
Moving Avalanche-specific settings to after mapleader is set :P
Merge branch 'master' into avalanche

Conflicts:
	vimrc
Merge branch 'master' into avalanche

Conflicts:
	vim/vimrc
Merge branch 'master' into avalanche
Commenting out YouCompleteMe bundle until I get this running under
Windows.
Fixing vimrc install name for Windows.
Switching line editor mode to emaces - the vim mode is too wonky.
Switching zsh line edit mode to emacs.

Merge remote-tracking branch 'origin/avalanche'