More changes to use ui-router.  Some grunt and karma changes to properly load/concat files properly.
Merge remote-tracking branch 'origin/master'