Merge pull request #571 from moneyadviceservice/requirejs-fix

Fix require.js loading.
Revert "Fix require.js loading."

This reverts commit 9ed9f1bff6225e6595f4b1edceef72403f782a33.
Revert "Pull RequireJS config into layout not into application.js"

This reverts commit b60c2a7357dd70c39dee1c3986edfe6c0fef614f.