Merge branch 'master' of github.com:ocodo/emacs.d

Fixing submodule remote uri
installed mainline and updated other packages
a