Merge pull request #15 from lukaselmer/vfs-base-dev

Vfs base dev
Merge branch 'master' of https://github.com/lukaselmer/VFSPrototype into vfs-base-dev-tmp