Fix for grunt-requirejs.
Fix for config.xml.
Misc tweaks for conformity.