Revert "Revert "Merge pull request #1140 from dimagi/show-id""

This reverts commit 470c74a0c1c8880d4a2ce249020fc4df62f5db6e.
add a maps adapter for traditional reports, and some asserts to prevent confusion
support sort_key/html style data from server
add a minimum height to the map div
allow configuration of reminder to a single user
change children in household property
Fixed the has_datespan calculation in reports

It would error if the filter was an explicit reference to a field and
not a string reference.
when applying datespan shifts, make sure we don't go into the future
Merge branch 'master' of github.com:/dimagi/commcare-hq into indicator-pillows
Merge pull request #1351 from dimagi/indicator-pillows

when applying datespan shifts to indicator defs, make sure we don't go into the future
check against basestring rather than str
fix silly mistake
adding secret_key to travis localsettings

django 1.5 is stricter on this now
Merge pull request #1350 from dimagi/fix_datespan_field_check

Fixed the has_datespan calculation in reports
Merge pull request #1353 from dimagi/travis_settings

adding secret_key to travis localsettings
fixed bp_cash and child_cash results

Also fixed month/year attributes on scheduled snapshots
Revert "Merge pull request #1333 from dimagi/django-1.5-compat"

This reverts commit 41752d0de79a0b7761b532c4edeccbf1e7c8772b, reversing
changes made to 3f27a420f3ae2f6f3c3a0c2cec48af2d423b5496.
tweak off-master scare message to work for preindex too
change preindex email text not to say that it is complete

but rather that it is a good time to check the tasks to see if it is complete
Display nothing rather than 'None'