Packagejson merge
Merge https://github.com/keikreutler/extinctly

 especially if it merges an updated upstream into a topic branch.
 Lines starting with '#' will be ignored, and an empty message aborts
Switched to ngRoute
Style tweaks