Set filetype=html on ClassParser includes
Indent Gherkin with spaces
Remove Jedi
Python mode
Summerfruit256 color scheme
Merge branch 'master' of github.com:koterpillar/vim

Conflicts:
	.gitmodules