new ps1 prompt including git branch
tmux mouse mode
Merge branch 'master' of https://github.com/dpkay/unixconfig

Conflicts:
	bashrc
	tmuxrc