Use underscore.php to sort
Merge pull request #5 from matthewspencer/underscore

Use underscore.php to sort
Merge master