Update .Xresources
updated pythonpath into vimrc
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.Xresources
	.xinitrc