updated r.js
updated require.js
Merge branch 'master' of github.com:negative/requirejs-rails