reorg.
simplified configuraition
Merge branch 'master' into single-command

Conflicts:
	loads/transport/agent.py
fixed slave option
flake8-ed
Merge pull request #85 from mozilla-services/single-command

Single command