minor updates
Merge branch 'master' of github.com:ihameed/dotfiles

Conflicts:
	.vimrc