vimrc updates
git aliases
Merge branch 'master' of github.com:jamesob/dotfiles

Conflicts:
	vimrc
fixes