final
Merge branch 'master' of git://github.com/ricojansen/elasticsearch-degraphmalizer

Conflicts:
	src/main/java/org/elasticsearch/plugin/degraphmalizer/Updater.java
	src/main/java/org/elasticsearch/plugin/degraphmalizer/UpdaterManager.java