brings .gitignore up to date
sets up the SQL to filter everything to do with filter string input
sorts out local conflicts
makes the filter work properly!!