Revert "Merging dev -> master via PR"

Reverts rackerlabs/developer.rackspace.com#485