tidy up `Makefile` and `.gitignore`
Merge pull request #200 from mor1/master

tidy up `Makefile` and `.gitignore`