[Argha/DJ][Paul] moving local customisations for South Sudan over to a branch
[nim, jmdb] Adding unicef deps to setup.py
[jmdb] Putting the dependencies back to like master
Merge branch 'master' into south_sudan
[Argha,Carlos] merge branch 'south_sudan' into master