Update for Batteries 2.0
Merge branch 'master' into release
Prepare for 0.03 release