cleanup
cleanup
Merge branch 'master' of https://github.com/w2ogroup/streams-examples

Conflicts:
	elasticsearch-reindex/src/main/resources/application.conf
	gmail-export-standalone/src/main/resources/application.conf
	twitter-userstream-local/src/main/resources/application.conf
cleanup