some general fixes, nice additions to setup.sh
Merge branch 'master' of http://github.com/finbarrocallaghan/dotfiles

Conflicts:
	tmux.conf
	zshrc