Removed deployment section
Fixed merge conflicts
Removed references to broken links
Merge pull request #5 from rackerlabs/more-readme-fixes

More readme fixes