Update requirejs, r, and almond
Merge pull request #6 from billmag/requirejs-2.1.2

Update requirejs, r, and almond