Correct return value from cancelled pickAFile() and pickADirectory()

[jsenning]

Made value returned by pickAFile() & pickADirectory() to be None if cancelled