tmux tweaked
tweaked bashrc for rvm
Merge branch 'master' of github.com:bugthing/dotty

Conflicts:
	dotfiles/.bashrc
	dotfiles/.tmux.conf