Rearrange make.conf and add .gitignore