Adding work stuff
updated gvimrc vimrc
Updated gvimrc for new font face
Updated
Merge branch 'branches/bglover_mac'

Conflicts:
	after.vimrc