Made Timestamper serializable
Merge branch 'master' of github.com:metamx/tranquility

Merge