Updating bashrc and tmux
Merge branch 'master' of https://github.com/gphan/gphan

Conflicts:
	.tmux.conf
Updates to vim with new airline settings and updating tmux
Adding zshrc
Merge branch 'master' of https://github.com/gphan/gphan

Conflicts:
	.bashrc