fix zip
erge branch 'dev' of https://github.com/Chandler/flesh into dev
erge branch 'api' into dev
remove all application logic from main.coffee, it's only a bootstrapper for ember-requirejs now
also I'm on a plane
Merge branch 'api' of github.com:Chandler/flesh into dev
Merge branch 'api' of github.com:Chandler/flesh into dev
override ember-data extract method to conform to jsonapi spec
merge branch 'dev' of https://github.com/Chandler/flesh into dev
working on client
refactor
router fix
Merged in api
name instead of id
Merge branch 'api' of github.com:Chandler/flesh into dev