app/js/router.js: consolidating router & app
app/js/app.js: consolidated with router.js

* run #config then #run, even though these are call backs

* consolidating ensures that there are no load order problems

* also makes dependency injection a little easier

* app now works with ui-router, but still using $routeProvider