Upgrade to ElasticSearch 1.0
Regression fixes.
Tag Rework
Refactor tag variables