fix IsFile return true if is directory
Merge remote-tracking branch 'origin/master'

Conflicts:
	file.go