Updated url to maki submodule to https

Fixes GitHub pages builds (they don't support SSH submodules)
Merge branch 'master' into gh-pages