fix deprecations against ember beta
keywords hash is not always present
Merge branch 'master' into ember-1.9-compat
move away from deprecated form of #with
test timing adjustment
Compatibility with newer ember helpers
re-enable CI for beta
compatibility with newer ember
minor documentation update
fix deprecation
prevent deprecation warning
minor doc update
prevent deprecation
re-enable CI for canary