Removed timebomb since we are one java 1.7 now!
Merge pull request #989 from rackerlabs/date-conversion-test-fix

Removed timebomb since we are one java 1.7 now!