Fixed searching machine images
Merge pull request #3 from erik-johnson/develop

Fixing ip address parsing bugs for vms. Removed extra slash in locations
Merge pull request #2 from greese/develop

Develop