Update the switch-theme.rb script allow switching to no theme
Merge branch 'feature/switch-theme-none-option' into rails-3-develop

Conflicts:
	script/switch-theme.rb