better fix for aphyr/riemann#233
Indexing an expired event should result in removal
Merge branch 'master' into feature-top-expire
Merge pull request #308 from pyr/feature-top-expire

indexing an expired event should result in removal
Merge branch 'issue-233' of github.com:pyr/riemann into pyr-issue-233

Conflicts:
	src/riemann/common.clj
Merge branch 'master' of github.com:aphyr/riemann
riemann.common/get-hostname: Docstrings, extract constant.