#263 reverted work on ES reconnection
#263 re-adding atom for flagpole
Merge branch 'master' into es_v131

To remove the automatic ES restart + upped version to 0.3.6

Conflicts:
	project.clj
	src/clj_components/components/elasticsearch.clj