minor cleanups
Merge branch 'master' of https://github.com/wouterbeek/Bertrand
Upped submodules.