Updating to work with zsh plus some cool new commands
Merge branch 'master' of https://github.com/eblincow/dotfiles

Conflicts:
	.gitignore
	.profile
	.zshrc