Fix pull, merge and start from non-TLDs

Pull #45 (f11ff4c) only fixed this for feature/hotfix switch. These
changes are needed any time git-submodule is run from somewhere other than the projects root.