Load shim from package name if no shim for moduleName.

Possible fix for jrburke/r.js#310
Use nonPackageName.
Add test for #jrburke/r.js#310
merge of pull #331
Relates to #331, wire up test.
snapshot