updating rabbitmq and modules
Merge branch 'master' of https://github.com/rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint
Merge branch 'master' of https://github.com/rcbops/chef-cookbooks into sprint
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint
Merge pull request #282 from rcbops/sprint

End of Sprint 16 Merge
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint

Conflicts:
	cookbooks/rabbitmq
Adding nova-network::network to compute role and nova-network::setup to controller roles
Merge pull request #285 from jcannava/sprint

Updating roles to support network cookbook for nova.
trying to update
adding nova-network submodule
adding nova-network submodule
Merge pull request #286 from jcannava/sprint

adding nova-network submodule
Auto Updating nova-network submodule
Auto Updating corosync submodule
Auto Updating nova submodule
Auto Updating nova-network submodule
Auto Updating apache2 submodule