Merge pull request #69 from OpenF2/1.2-wip

Release 1.2

.jshintrc

@@ -0,0 +1,22 @@
+{
+	"browser": true,
+	"curly": true,
+	"evil": true,
+	"globals": {
+		"console": true,
+		"define": true, "exports": true, "require": true, "module": true,
+		"describe": true, "xdescribe": true, "it": true, "xit": true, "expect": true, "runs": true, "waits": true, "waitsFor": true, "itConditionally": true,
+		"easyXDM": true,
+		"EventEmitter2": true,
+		"F2": true,
+		"jQuery": true,
+		"$": true
+	},
+	"latedef": true,
+	"noarg": true,
+	"quotmark": "single",
+	"shadow": false,
+	"sub": true,
+	"undef": true,
+	"unused": "vars"
+}

.travis.yml

@@ -1,12 +1,9 @@
-language: ruby
-rvm:
-  - 1.9.3
+language: node_js
+node_js:
+  - "0.10"
 notifications:
   email: false
 before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  - npm install grunt-cli
 script:
-  - "wget https://raw.github.com/mark-rushakoff/OpenPhantomScripts/master/phantom-jasmine.js"
-  - "phantomjs phantom-jasmine.js tests/index.html"
-  - "phantomjs phantom-jasmine.js tests/index-amd.html"
+  - grunt travis

CONTRIBUTING.md

@@ -18,7 +18,7 @@ A couple of ground rules.
 
 * Create a branch from where you want to base your changes.
 * Do not work directly in `master`; create a branch _based on_ `master` using `git checkout -b 'your_branch_name' master`.
-* Follow our [coding standards](https://github.com/OpenF2/F2/wiki/Contributing-to-F2).
+* Follow our [coding standards](https://github.com/OpenF2/F2/wiki/Coding-Standards).
 * Preferably add _and document_ unit test(s) for your changes. 
 * Re-run all the Jasmine tests to confirm your changes didn't break anything.
 * Perform browser testing in our [supported browsers](wiki/Browser-Compatibility).
@@ -38,7 +38,7 @@ Coding standards promote a common vocabulary and syntax so that our fellow devel
 
 Coding standards help an individual project, and also make it easier for one project to reuse components from another project. This, of course, is a core component of F2.
 
-Read our [coding standards](https://github.com/OpenF2/F2/wiki/Contributing-to-F2) on the wiki.
+Read our [coding standards](https://github.com/OpenF2/F2/wiki/Coding-Standards) on the wiki.
 
 ## Keep in Touch