Fixed a broken import, added more time to add_floating_ip task to account for images that take a LONG time to spawn.
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere