syncing up with Matt
Merge branch 'master' of github.com:encorelab/CommonKnowledge
trying out sorting