Merge pull request #367 from galstrom21/sprint

forgot to add the nova-conductor role
Auto Updating nova-network submodule
Auto Updating nova submodule
Auto Updating nova-network submodule
Auto Updating horizon submodule
update "modules" submodule to point to latest commit
Auto Updating swift submodule
Auto Updating horizon submodule
Auto Updating glance submodule
Auto Updating glance submodule
Auto Updating graphite submodule
Auto Updating exerstack submodule
Auto Updating exerstack submodule
Auto Updating keystone submodule
Auto Updating keystone submodule
Auto Updating osops-utils submodule
Auto Updating keystone submodule
Auto Updating keystone submodule
Auto Updating swift submodule
Auto Updating swift submodule