Track sort
Revert "Dont include by"

This reverts commit 59e9bb66c0cf9c413d40ed8e17b3029b917364fa.

Conflicts:
	lib/find_codemarks.rb