Bring back makeURL.
Fix more merge stuff.
os.path -> constants.ROOT