continuing move toward language agnosticism in numishare
Merge branch 'egypt'
Merge branch 'master' into uva