Improved r.js build