Updated gitmodules to use my fork, and updated optional fork code in base.py