use rjs proper rather than amd-optimize (bug 1092718, 1078093)

https://github.com/mozilla/marketplace-gulp/pull/4/

Reflect the changes with using rjs in the package builds.