adds diff to gitignore
changes .mc to .qk. Reindents some code
reduces checking separate flag cases into one case