Fixed coloscheme for rxvt, added showmarks module.
Merge branch 'master' of github.com:geektophe/vim-config

Conflicts:
	vimrc