Updated again.
Merge branch 'master' of github.com:rcoppolo/dotfiles
Merge remote-tracking branch 'origin/master'

Conflicts:
	vimrc
Adds tmux.conf.