cleanup.
Merge branch 'test' of github.com:project-fifo/jingles into test
Fixed bug not allowing to managed VM's w/o alias.
Merge branch 'test' into dev
Merge branch 'dev' of github.com:project-fifo/jingles into dev