allow custom python nose path
Merge branch 'master' of git://github.com/yejianye/vim-setup

Conflicts:
	.vimrc_common