Updated pymode settings
Merge branch 'master' of github.com:bbelyeu/vim-python

Conflicts:
	ftplugin/python.vim