Merge remote-tracking branch 'ebryn/master'

# Conflicts:
#	ember-model.js
#	packages/ember-model/lib/attr.js
#	packages/ember-model/lib/belongs_to.js
#	packages/ember-model/lib/has_many.js
#	packages/ember-model/lib/rest_adapter.js

Author: Paul Oliver

README.md

@@ -10,7 +10,7 @@ EM is still a work in progress, but it's flexible and stable enough to be [used
 
 ### Ember CLI
 
-`ember install:addon ember-model`
+`ember install ember-model`
 
 ### Bower
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-model",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "main": "ember-model.js",
   "dependencies": {
     "ember": "~1.13"