ElasticSearch and Versionable updates

@webtechnick would you please review the Versionable updates?
@mreishus your changes have been reviewed already.