Add sorting
Merge branch 'master' into sort
Fix sorting
Use postgres in travis
use postgres in all environments
Make travis work with postgres
Merge pull request #16 from sprotocols/sort

Sort