Make chroot optional

Just jkarneges pull-request #182 with cleaned-up history