added python-mode
Merge branch 'master' of https://github.com/feed57005/user-profile

Conflicts:
	.vimrc