Clean up the ignores as well. This commit was SVN r5811.
Add a unit test for that functionality - will test more fully next week. This commit was SVN r5806.