Some updates to my dotfiles of various sorts...
vimrc revamp :) :) :)
Merge remote-tracking branch 'origin/master'

Conflicts:
	bash/bashrc
	tmux/teamocil/uspto.yml
	vim/vimrc