Added fix for ttl in datastore
Fixed the tests I accidentally overwrote
Removed an extra rate limit entry because it made tests fail (!!!)
Merge pull request #1202 from rackerlabs/fix-datastore

Added fix for ttl in datastore