modified picrust workflow
fix json
fix missing shockhost
updated ip
update awe ip
updated description
object name instead of object ID
emirge
fix conflicts
Hotfix to auth widget.
Merge branch 'master' of https://github.com/kbase/narrative
Widget for launching phenotype simulation
More login cookie fixes.
Merge branch 'master' of http://github.com/kbase/narrative
Merge pull request #13 from kbase/FunctionalCategoriesWidget

Functional categories widget
Merge pull request #1 from wgerlach/master

picrust workflow and other minor stuff
Merge pull request #14 from teharrison/master

picrust workflow and other minor stuff
Fixed a tab that should've been spaces.
Added widget for viewing Functional Categories
Fixes to Functional Categories so that data file loads properly