Fixing the terrible things I did with Git just now

I broke some stuff by forcing a merge halfway through conflict
resolution
still fixing
Merge pull request #10 from joconno2/jim-branch

Jim branch