Pre-merge commit.
Merge branch 'master' of github.com:gui11aume/.vim

Conflicts:
	doc/tags
Added taglist plugin, fixed colors on different terminals.
Merge branch 'master' of github.com:gui11aume/.vim

Conflicts:
	.netrwhist
	vimrc