Improve filter on import

Instead of showing all images, we set the filter to the smaller of the
default import rating and the current filter. This ensures that the
imported images are shown, but that we don't reduce the filter
unnecessarily.
Update comments for improved import filter handling
Keep old import filter reset for collect operations
Merge pull request #260 from bencahill/master

Improve filter on import