re #601 - Sort by file path
re #601 - Make that an elseif instead of an if.
Merge branch 'master' of git.assembla.com:timble-police.2