Riemann aws-status

I've probably done this wrong. But the changes in #13 looked pretty handy, so I've pulled them down and merged in master.