2.1.5.7 updates

Note that this doesn't include the CB updates. Meneth or ziji is going
to have to take a look at those.
Merge pull request #183 from thefinestsieve/beta

2.1.5.7 updates