Swapping awssum for knox due to bug#973259
Merge branch 'master' into bug-973259-switch-s3-paths

Conflicts:
	bin/controller
	lib/apk_project_builder.js
	lib/s3.js
Merge pull request #50 from mozilla/bug-973259-switch-s3-paths

Swapping awssum for knox due to bug#973259