Macports be like dead and gone dead and gone
Update submodules
Fixes
Merge conflict
Stuff