on the way to fixing water point merge issues
fixing water merge issues in 661 dataset
fixed bug
fixing the pilot water scripts
water 113 fixings
Merge pull request #19 from modilabs/water_point_merge_issues_fixing

tested and looks good