Fixes for parsing excludes file

Three commits:
- Fix filenames with "+" in them.
- Minor cosmetic change.
- Fix handling blank lines and comments.