change gitconfig and vimrc
Merge branch 'master' of github.com:tluna/tluna

Conflicts:
	vim/vimrc
	w3m/history