Improve Google Drive directory querying (closes #526)
Merge branch 'gd-dir-querying'