Cleanup

This pull request contains the following changes:
 - Clean up of redirects and admin tests
 - Mass renamed 'search_query' to 'query_string' (for consistancy). This should fix #114.
 - Fixed some indentation issues in templates (mixing tabs and spaces)