Ready for pull
Makefile
Disable imlib caching, improve vfs container handling