Merge pull request #154 from therealprologic/master

PEP 8 compliance
deploy updates
merged master
minor updates to deploy fabfile
Allow an optional admin password to be specified via options to ``setup``.

e.g:

```
fab setup -u root -H docker0 setup:adminpw=admin
```
Separate out the config for the supervisor shipyard-agent using fabric.contrib.files.upload_template