Start again, better this time.
Merge branch 'master' of github.com:j2blake/instance-control-scripts

Conflicts:
	distro.rb
	t_show_status.rb