Add sortable columns, fix code speed improvements
Merge pull request #535 from timschofield/develop

Add sortable columns, fix code speed improvements