Upgraded ember to RC7
Basic JSDoc (for testing purposes)
Added JSDoc for controllers.coffee and views.coffee
JSDoc for mixed-in interfaces
Merge branch 'node-static' into v2

Conflicts:
	package.json
Merge branch 'master' of https://github.com/Addepar/ember-table into jsdoc-in-coffee

Conflicts:
	package.json
Merge remote-tracking branch 'origin/jsdoc-in-coffee' into v2

Conflicts:
	package.json
Merge remote-tracking branch 'origin/master' into v2

Conflicts:
	package.json
Cosmetics
Merge remote-tracking branch 'origin/upgrade-ember-to-rc7' into v2
Watch task is back again