some cleanup, emberfire  as an ember-addon is still not quite working though