Last-minute fixes
Merge branch 'master' of https://github.com/picobyte/baconjam6