misc
Merge branch 'master' of github.com:tuxcanfly/CalVIM

Conflicts:
	.vimrc