Move things around to handle awsbox deploy
Merge branch 'develop' into develop-latest-test
Merge pull request #214 from mozilla/develop-latest-test

Fix awsbox deployment