Some merging and stuff.
Add a wishlist of gitmodules :)