Cleanup

Conflicts:
	deploy/add-cloudwatch-alarm.py