Minimal changes to keep time class from interfering with the ruby time.now call in my class.
Merge branch 'bugs' into develop