Merge pull request #26 from yshahin/feature/names-fix-17-dev

Info data for VMs and templates is merged
Merge pull request #21 from yshahin/feature/names-fix-17

Switch to using full file paths as keys for templates instead of filename/name.