Update and Merge all git ignores.
Added user-default-mods.json to the ignore list as this is a user setting
Merge branch 'update-ignore' of https://github.com/macrosblackd/Cataclysm-DDA into macrosblackd-update-ignore