Rename vars in normalize for a bit more sanity before refactoring
Don't use __unicode__ recursively
Reorder if tests and add comment
Rewrite normalize() to work iteratively not recursively

It was very easy to build up extremely deep binary trees
with reduce(operator.or_, ...) which are equivalent to a
tree of depth 1 with large numbers of siblings.

normalize() would choke on doing the simplification when
it was recursive.

unicode still works recursively (and should also be changed
to work iteratively) but it's much harder to generate a genuinely
very deep tree which cannot be simplified, so it's much harder
to run into this issue there.
Fix querying documentation on faceting

Update faceting documentation to reflect correct argument (changed 'fields' argument for `facet_by` to 'field')
Correct minor changelog merge issue

Correct a merge issue in the change log - some lines got out of sync
typo
Fix mx.DateTime test
Fix pyflakes warnings (unused imports and vars)
Fix pyflakes warnings

Unused imports and redefinition of function
Add support for Solr's JSON API

For large results sets, this can be parsed and interpreted much more
efficiently than the equivalent XML response.

TODO:
 * Support JSON for queries other than /select
 * Support "interestingTerms" in MLT queries
More efficiency improvements for JSON client

The general principle here is that because the dicts json.loads gives us
are very close to the final format we want, we can just do a few
in-place modifications to these dicts rather than build entirely new
data structures.
Typo fix and comment
Merge pull request #77 from evansd/support_solr_json_api

Support Solr JSON api
Merge Timetric changes

Conflicts:
	sunburnt/search.py
Merge pull request #78 from evansd/master

Merge Timetric changes
Merge pull request #74 from simon-liu/fix-doc

fix typo error
Documentation for field names
Merge pull request #75 from helix84/doc-fieldnames

Documentation for field names
Merge pull request #68 from davidjb/patch-2

Correct minor changelog merge issue