Bugfixes: Resetting config option for branches and correct use of os.path.join()
Documentation updated