0.9 merge

haven't got flushLogs testcase working.

I might have done a little too many changes in jail parsing. We'll see.