Merge pull request #59 from daniellemayne/develop

develop - simplified listing of vms by cutting down the number of api calls