Better snippets & misc tweaks
Merge branch 'master' of github.com:ilja/new-dot-vim

Conflicts:
	vimrc