3632 Filter collections by type as 'and' filter
3632 Tidy new code, rename option for any collection
3632 Improve indenting in collection filters view
3632 Tests for Travis to run so I can see if the last step fails there too
3632 Check challenge type instead of id for non-challenges
3632 Different tests and different syntax on no challenge scope
3632 Should be able to sort and filter collections simultaneously