when enabled, use version for diffing instead of time
Merge branch 'versions' into bucket

Conflicts:
	spec/lib/version_spec.rb