Reverting back to bash
Updated zshrc
Merge branch 'master' of https://github.com/ianbibby/dotfiles

Conflicts:
	zshrc