Bringing it up to new design
snapshot
Merge branch 'master' of github.com:mytestbed/labwiki_topology_plugin
Snapshot