Don't revert to cluster zone when defined zone is none
Fixed spothistory command
Merge branch 'cheapest_price' into vanilla_improvements

Conflicts:
	starcluster/cluster.py