ENHANCEMENT: Default to Folsom
Merge pull request #7 from rackerjoe/work

Merged automatically by jenkins after successful build test
don't run nova-network on nova-controller
Merge pull request #8 from mancdaz/master

Merged automatically by jenkins after successful build test
Documentation cleanup
Display resource examples properly
More minor doc cleanup
Final minor cleanup
Outline networks format
Correct incorrect formatting
Merge pull request #9 from mattt416/doc_cleanup

Merged automatically by jenkins after successful build test
set multi_host=true
Merge pull request #10 from mancdaz/master

Merged automatically by jenkins after successful build test
search for correct keystone-api role
Merge pull request #11 from mancdaz/master

Merged automatically by jenkins after successful build test
End of sprint version bump.
End of sprint version bump.
Update README.md
fixing some keystone tenant creation issues
make quantum-server service start by fixing api-paste.ini