pull
Merge branch 'master' of github.com:AaronGoldman/ccfs

Conflicts:
	interfaces/fuse/directory.go
	interfaces/fuse/filesystem.go
	interfaces/interfaces.go