Pulling Teressa's Changes into Master

Also need to test the changes to crewtinuous-deployment