Merge pull request #122 from levinas/master

Updates to router and client
Revert "Updates to router and client"
Merge pull request #123 from kbase/revert-122-master

Revert "Updates to router and client"
revert to @levinas pull merge
Merge branch 'master' of github.com:kbase/assembly
merge
Merge branch 'master' of github.com:kbase/assembly
Revert "Revert "Updates to router and client""

This reverts commit c556a25aaac804a2f730434aceb101bcc2594c46.