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

Been on a replace now with timestamp kick recently...