Updated timestamper to use moment.js