Merge pull request #1 from circatree/dev-ish

Shamefully massive update
Install Drush on dev web-servers.
Add Oh-my-zsh state.
Remove ugly inline comment from top file.
Fix typo in Jenkins server matching expression.
More states [new: python-pip;dev]--to Docker hosts.
Add Composer state.
Remove htpasswd definition from nginx state (assumes single tenant nginx server).
Merge branch 'master' into dev-ish

Conflicts:
	nginx/init.sls