Use 'FIXED_WINDOW' instead of relativedelta.. add additional logging. Don't charge users for 'resuming' instances
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into herja
Super-small change to start_machine_imaging task to help recover from exceptions