Remove stringtools submodule
Merge branch 'master' into mac