Master to 0.9

fixed jail.conf problems in previous PR.

Seems Travis has hit its capacity ( http://status.travis-ci.com/#day). I should give it a break and get back to real work :-)