Merge pull request #1802 from devoncarew/update_ignores

update gitignore and analysis_options