Merge branch 'james-dev' into 'master'

James dev

See merge request !14
4 jobs for master in 4 seconds (queued for 1 second)
Status Job ID Name Coverage
  Set Env
passed #3583
storjapi
set-pypirc

00:00:01

 
  Deploy
passed #3584
storjapi
deploy-production

00:00:02

 
  Cleanup
passed #3585
storjapi
cleanup_pypirc

00:00:00

 
  Db
passed #3586
storjapi
update_db

00:00:00