fixes to improved water, improved functional water, and improved sanitation indicators
fixing part of T1, and T3. T1 may need some separation of health + education indicators
fixing tests along with the new revised (functional / improved) indicators
Merge branch 'master' of github.com:modilabs/nmis into improved_functional
Merge pull request #207 from SEL-Columbia/improved_functional

Improved functional