init
Merge remote-tracking branch 'garbas/master'

Conflicts:
	after/plugin/snipMate.vim
	autoload/snipMate.vim
	doc/snipMate.txt
	plugin/snipMate.vim
	syntax/snippet.vim