gemspec mod
silly merges
add datetime