Beef up Makefile and update gitignore