Style tweaks
Fix r.js build, update RequireJS