make this consistent. why are these files separate again?
version bump
Merge pull request #81 from rackerlabs/next-release

Next release