Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	service/tasks/allocation.py
ATMO-295 Helper script to fix any invalid instances.

* Any instances with metadata tmp_status set to networking
  will be set to the empty string.

	new file:   scripts/remove_networking_metadata.py
Merge branch 'atmo-295' into gunnr