Merge branch 'develop' into release/0.2.x
Version 0.2.0 beta 12
Merge branch 'release/0.2.x' of github.com:praekelt/vumi-jssandbox-toolkit into release/0.2.x

Conflicts:
	docs/conf.py
	package.json