Some config options and gitignore tweaks