replace use of now() with os:timestamp()
Merge pull request #54 from tsloughter/master

replace use of now() with os:timestamp()