listchars linux
Merge branch 'linux' of github.com:cstadach/dotfiles into linux

Conflicts:
	vim/vimrc.symlink
added linux mergetool