change path of rupa/v
add tmux.conf to setup
Merge branch 'master' of github.com:sepeth/dotfiles into redbeacon

Conflicts:
	.gitmodules