do more vimrc things
add vim plugins: AutoTag, Rainbow Parentheses, Indent Guides
fix listchars, do some things for new plugins
start conflict resolution on dotfile install code
Merge branch 'master' of github.com:t-mart/dotfiles

Conflicts:
	dotfiles.sh
fix trailing whitespace on save, nolist, rainbow parens on startup