pshh, and people said require.js would be hard to integrate with ember
Merge branch 'dev' of github.com:Chandler/flesh into dev
Merge branch 'dev' of github.com:Chandler/flesh into api