Categorize ignore types

This is much easier to digest and will better accommodate more entries.
Cleanup
Revert to working make branch session script

I haven't given up on the goal of keeping repo specific sessions, but for now
I at least want the previous working behavior.