Merge branch 'generalize_so_not_quite_so_specific_to_ec2' into msabramo_develop

Conflicts:
	src/configure.py