Fix build
Merge branch 'master' of https://github.com/BlueBrain/codash
Merge cleanups, fix unit tests