Added tmux config and tmux-powerline.
Merge branch 'master' of github.com:davidstalnaker/dotfiles

Conflicts:
	.gitmodules