Updated modules to point at forks
Updated gitmodules