better fix for aphyr/riemann#233
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