Removing dos file endings from one file (probably more to do)

Also fixed bad use of os.path.join()