Added some plugins
Merge branch 'master' of github.com:danielrhammond/fu

Conflicts:
	zshrc