Merge pull request #5 from jportner/master

Added AWS cloud compatibility
More user model compatibility fixes

New user model sets certain user properties (vm_id, vm_ip, and
vm_ip_id) to blank strings, where they were previously undefined.
This was breaking some checks that took place concerning cloud
providers.