Merge branch 'release/0.6.0' into develop
Merge branch 'master' of github.com:Scotts-Marketplace/bronto-python into develop
Bumped version, added CHANGELOG
Merge branch 'release/0.7.0'