Fix Relation#sort_by to handle a list of attribute names
Merge branch 'master' into axiom-types-refactor

Conflicts:
	config/flay.yml