Ignore our two new GUID options when importing, too.
Merge branch 'master' of github.com:chrismeller/import