Use https for submodules to avoid needing ssh key all the time
Merge branch 'master' into osx