Survey (Grid) Line Distance and House Cleaning

Just when I thought I had GIT figured out.....

I am not sure why it is trying to add the first three commits, our forks were even I thought.... (they have already been added to the diy fork)

If you can use the last two somehow that would be great, otherwise I will try and fix this somehow..

Thanks.