Update gitignore; adjust the indentations in Makefile