PR fixups - will be squashed

 - Fixes getting type information from RHS query params
 - Adds unit tests
 - Adds support for Django 1.7