Squashed commits
Remove weird git merge tag
Merge remote-tracking branch 'origin/288_es_v131_jsonamqplogging_sq'

Conflicts:
	.gitignore
	project.clj