add ember support for 404s
unused & whitespace
Merge branch '404'
Merge branch 'master' into heroku
make items async
Merge branch 'heroku'