I removed some more merge markup, added a .gitignore, and took the .pyc files in the mrgaze subdirectory out of VC, as they should be automatically generated by python from the source code.
These don't have a lot to do with each other, so if you don't want to do one or more of them let me know and I'll make a pull request with just the changes you want.
All changes look good - thanks again for cleaning this up. I didn't have time to run through checks on execution yet, but it looks like you're catching issues faster than I am right now :+1:
I removed some more merge markup, added a .gitignore, and took the .pyc files in the mrgaze subdirectory out of VC, as they should be automatically generated by python from the source code.
These don't have a lot to do with each other, so if you don't want to do one or more of them let me know and I'll make a pull request with just the changes you want.