shorten the makefile, tweak gitignore to compensate