update make commands
Merge branch 'master' of github.com:dirvine/dotfiles

Conflicts:
	.vimrc
snippet for class and surround plugin