tux-ninja disaster recover
Modified tmux term stuff
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	tmux.conf
	zshrc
Added powerline fonts