Added deploy_error as a 'build' task, so that it is not counted as 'active' time.
Merge branch 'gunnr' into herja
Fix string formatted error in atmo_init_full modify_rclocal.
	modified:   init_files/v2/atmo_init_full.py
Fix a string formatting problem.
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into herja