fix imports; add vm_usage section to default config file
Merge remote branch 'origin/master'