add fixtures and initial cleanup of map output
Merge branch 'master' of github.com:eHealthAfrica/swiss-knife