Fixes for models (cmd line query); Vagrant issues; ongoing builder issues.