Merge pull request #5 from barak/master

tweaks to Makefile, remove derived files, bike shed .gitignore, cactii is not a word