Part 2
Fix
Merge pull request #153 from dockyard/bc-ember-rails-part2

Part 2