reset timebomb, we are almost ready to move to 1.7
Merge branch 'master' of https://github.com/rackerlabs/repose into B-62422