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 set-pypirc #3583
storjapi

00:00:01

 
  Deploy
passed deploy-production #3584
storjapi

00:00:02

 
  Cleanup
passed cleanup_pypirc #3585
storjapi

00:00:00

 
  Db
passed update_db #3586
storjapi

00:00:00