Zbatery 0.5.0 - Rainbows! 2.0.x sync

This release syncs up with the latest from Rainbows! 2.0.x
and Unicorn 3.0.x.  See Rainbows! and Unicorn release notes
and changelogs for relevant details.