Merge pull request #155 from therealprologic/master

Separated supervisor config and Optional admin password for setup task.
added openvswitch to fabfile
Merge branch 'master' of github.com:shipyard/shipyard