Using the ActiveModelSerializer simplifies things greatly
Updated combined js file
Merge branch 'bootstrap_v3' into emberjs