add lots of plugins
Merge branch 'master' of github.com:hotgloupi/conf

Conflicts:
	zsh/.zshrc