Finally fix up conflicts from moving files around 2 computers using 2 different github accounts