cleanup
minor
Merge branch 'master' of github.com:kbase/assembly
Merge branch 'kbase' into ff