issue 18
Merge branch 'master' of github.com:owilliams/ember-weekly