updates for vam
Merge branch 'master' of github.com:dirvine/dotfiles

Conflicts:
	.vimrc