Set mediawiki filetype when editing our wiki doc via It's All Text! in Firefox.
Made some colour scheme adjustments
Merge branch 'master' into lightline

Conflicts:
	.gvimrc
Fixed colours in some cases