Updating .gitignores.
Removing .tag files for help with merging.
Trying to merge master to dev.