Merge pull request #239 from mojavelinux/ruby2-compat

ruby 2.0 compat
use DateTime instead of Time to preserve tz info
Merge branch 'datetime' into integrate