closes #1028
closes #961 and puts scripts in a better place
closes #844
closes #996
Merge pull request #1048 from OCHA-DAP/marianne-sprint

Marianne sprint