-Copyedit time->timestamp
Merge pull request #121 from mmcguinn/master

Copyedits