added a load of cool stuff
Merge branch 'master' of https://github.com/dunolie/oh-my-zsh

Conflicts:
	.zshrc
	custom/plugins/functions.zsh
	custom/themes/dunolie.zsh-theme