pep8, thrift, lisp, scheme, etc
Merge branch 'master' of github.com:robin-allen/.vim

Conflicts:
	.gitmodules
	.gvimrc
	.vimrc