converting to new router
Merge branch 'new-router-api' of github.com:OC-Emberjs/yourjargon into new-router-api
Merge branch 'new-router-api' of github.com:OC-Emberjs/yourjargon into new-router-api
Updated for new routing magic - note only working when clicking 'login'