Add sym link pointing to secret tmux setup
Merge branch 'master' of github.com:jdavis/dotfiles

Conflicts:
	.tmuxinator