0.2.1

This is that bug fix release I have been meaning to cobble together for weeks.

Any other suggestions to go in here?