buildroot.sh: Indentation
Don't abort when the .img.xz image failes, but give a warning instead.

The build runs fine on Raspberry Pi, but `xz` needs more memory than Pi provides.
Also keep the generated .img file needed later.
buildroot.sh: Build .img.bz2 as well

OS X users don't have `xz` installed by default, but it comes with `bzip2`.

The previous commit also helps with this scenario.
Merge branch 'master' into v1.0.x

Even though this branch is fully up to date, git doesn't think so.
I probably messed things up by cherry-picking, so this a fix for that.