Quick fix to prevent a KBCacheClient race condition.
Merge branch 'master' of http://github.com/kbase/narrative

Conflicts:
	src/notebook/ipython_profiles/profile_narrative/kbase_templates/static/kbase/js/widgets/narrativeLogin.js
Merge remote-tracking branch 'origin/master' into dev-aug_demo