Removing some magic to make naming conventions more sane

Related: https://github.com/stefanpenner/ember-app-kit/issues/184

Still a wip, this is where steph and i left off when pairing earlier.