Prepping for PyPI upload
Merge branch 'master' of github.com:jessedhillon/batteries