Add support to ignore patches with -2

Also do a few flake8 cleanups