more todo updates
Refactor the helpful queries
Formatting cleanup
Added last X days parameter to ConflictingFixes

Also created the sql_proxy account