Added config to build vm image as well.
Got rid of vm config (kinda redundant to maintain), and old uml-config
- this branch is trunk based and that's that.