Revert "Revert "Merge pull request #960 from dimagi/fd-types-cleanup""

This reverts commit b7db27efb3d1307ad7754ba66876cc724f5b8662.
Re-added Days for Review setting
Added default setting to keep forms forever
Merge pull request #1033 from dimagi/days_for_review

Re-added Days for Review setting
Fix a couple report typos
Add indicators for cd4 counts
Merge pull request #1053 from dimagi/care-indicator-typo

Fix a couple silly report mistakes
Merge pull request #1052 from dimagi/care-reports-indicators

Add indicators for cd4 counts
fix report header groups for sql reports
remove unnecessary field_classes conversion
Merge pull request #1054 from dimagi/report_grouping

fix report header groups for sql reports
use set instead of list
update psi-reports
Merge pull request #1057 from dimagi/report_grouping

use set instead of list
Merge pull request #1055 from dimagi/cruft

remove unnecessary field_classes conversion
update pathfinder and phonelog
always show cloudcare tab for mobile workers
include user and domain explicitly in cache
Merge pull request #1058 from dimagi/cloucare-enabled-mobile

always show cloudcare tab for mobile workers
use new style filter