python file type for scons
Merge branch 'master' of github.com:/initcrash/vimconfig

Conflicts:
	vimrc