Update to use @mdahlstrand's r.js