Bring master inline with latest changes to the
angular-ui-router/example app from step-6.
Updated step commits after more code cleanup.