Merge branch 'develop' of github.com:softlayer/sl-ember-model into de…

…velop

CHANGELOG.md

@@ -1,5 +1,13 @@
 # sl-ember-model Changelog
 
+### 0.2.0
+
+* [#10](https://github.com/softlayer/sl-ember-model/pull/10) Tweak README format
+* [#11](https://github.com/softlayer/sl-ember-model/pull/11) Add additional details to upgrade information
+* [#12](https://github.com/softlayer/sl-ember-model/pull/12) Close #9 Fixed failing test: application controller is not generated until initial route is visited
+* [#13](https://github.com/softlayer/sl-ember-model/pull/13) Feature/app controller injection test
+* [#16](https://github.com/softlayer/sl-ember-model/pull/16) Upgrade to ember-cli-0.1.3
+
 ### 0.1.0
 
 * Initial release

package.json

@@ -1,5 +1,7 @@
 {
   "name": "sl-ember-model",
+  "version": "0.2.0",
+  "description": "Ember CLI Addon - Data Model",
   "directories": {
     "doc": "doc",
     "test": "tests"
@@ -46,8 +48,5 @@
     "ember-addon",
     "model",
     "data"
-  ],
-  "ember-addon": {
-    "configPath": "tests/dummy/config"
-  }
- }
+  ]
+}