Merge proposals dependent on lp://staging/~justinmcp/unity-webapps-grooveshark/fix-module-imports

1. fix-module-imports
2. Dependent merge proposals