syncing up with Armin
Merge branch 'master' of github.com:encorelab/CommonKnowledge
faye issues?
Merge branch 'master' of github.com:encorelab/CommonKnowledge
things are too messy, trying to cut down and start over - basic restore finished for brainstorm, including restoring notes