Git dev

It seems that submodules don't like branches, so I have to merge this into master before I can see if it works.