Updated BaseUtils

@dylanrjames I can never quite figure out the right way to deal with submodules. Is this OK?