Update gitignore to disregard the default .htaccess file.
Update gitignore to more selectively allow for files/*/styles subdirectories/files that may be required for the system to function.
Put .gitignore back to mostly the way it was.