Add scalariform bundle
Merge branch 'master' of github.com:jawshooah/vim-pathogen

Conflicts:
	.gitmodules