updated to more recent rev
points to latest hardy rev
Merge pull request #25 from kbase/bug_fix-2014-08-03

Fix heatmap margin issue
Merge branch 'dev-aug_demo'
Symlink to ui-common subrepo wandered away - readding it.
Rearranged code to try to deal with race-conditions on startup.
Added diagnostic debugging code.
Removed extra console.log code.
Added explicit 'import biokbase' statement to startup commands.
Testing with additional explicit includes.
Possible workaround for overagressive firewall.
Workaround round 2.
Another workaround to keep %inv magics alive.
Started work on 502 Bad Gateway error
 jnomics bug fixes
points to new hardy revision
Merge branch 'master' of http://github.com/kbase/narrative
Merge pull request #26 from kbase/plant-bug-fix-2014-08-04

points to new hardy revision
Merge branch 'master' of http://github.com/kbase/narrative
Reflecting Sunita"s request