Add aggressive line shortening

This helps when shortening multiline dictionaries. To enable this use
the "--aggressive" option.
Merge branch 'shorten'
Remove obsolete tests

These are no longer picked up with the development version of pep8.
Add missing r prefix