update gitignore files
minor fixups and merge derps