add python syntax
Merge branch 'master' of github.com:ssivakorn/terminalconfig

Conflicts:
	vim/vimrc