Address TODOs in build

I still have a feeling this is going to fail because there is an issue with running `ember test`.  The issue being is that watchify blows up because you need to build the files to dist first.

Errr

Merge conflicts.