Adding r.js, also fix #34.