Fixed and tested some file completion behavior.
Merge pull request #33 from lincolnthree/master

Fixed and tested some file completion behavior.