Better support for different variations of vm definitions
.gitignore: Make entire custom directory ignored again