Consistent use of the `isString` function.
Merge branch 'is_string'

Conflicts:
	src/ember-resource.js