From master: remove sampling method
run ./generate.sh
Merge branch 'clean2'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/views/tournaments/_form.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/show.html.erb
Tournament: set status=0 by default
clean  up db/seeds.rb
remove dead references to {Tournament,Game}#sampling_method
oops