Merge pull request #7 from billmag/requirejs-2.1.2

Resolve conflicts between my 2.1.2 branch and gurdotan:requirejs2.1.2

Author: billmag

.rvmrc

@@ -6,7 +6,7 @@
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
 # Only full ruby name is supported here, for short names use:
 #     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p125@requirejs-rails"
+environment_id="ruby-1.9.3@requirejs-rails"
 
 # Uncomment the following lines if you want to verify rvm version per project
 # rvmrc_rvm_version="1.10.2" # 1.10.1 seams as a safe start

CHANGELOG.md

@@ -1,6 +1,10 @@
 <!--
 Marked Style: GitHub
 -->
+# v0.9.1
+
+- Updated to to require.js \ r.js 2.1.2, and almond 0.2.2
+
 # v0.9.0
 
 - **BREAKING CHANGE**: Upgrade RequireJS and r.js to v2.0.0

README.md

@@ -237,7 +237,7 @@ discussed below.
 
 ### jQuery
 
-jQuery users must use jQuery 1.7 or later (`jquery-rails >= 1.0.17`) to use it as an [AMD module](http://wiki.commonjs.org/wiki/Modules/AsynchronousDefinition) with RequireJS.  To use jQuery in a module:
+jQuery users must use jQuery 1.7 or later (`jquery-rails >= 1.0.17`) to use it as an [AMD module](https://github.com/amdjs/amdjs-api/wiki/AMD) with RequireJS.  To use jQuery in a module:
 
 ```coffeescript
 # app/assets/javascripts/hello.js