server install pip
Merge pull request #238 from kbase/hotfix

server install pip
Merge pull request #256 from kbase/ff

support for uploading interleaved PE library
Merge branch 'master' of https://github.com/kbase/assembly into ff
Merge branch 'master' into ff

Conflicts:
	tools/add-comp.pl
Merge branch 'kbase' into kbase-dev
minor update
Merge pull request #258 from kbase/ff

release engineering
Merge pull request #259 from kbase/dev

support for uploading interleaved PE library
Merge branch 'kbase'