python with vim (pep8)
Merge branch 'master' of https://github.com/Lswith/.vim

Conflicts:
	vimrc