change default page to isolate spammer
Merge branch 'master' of github.com:blakeeb/ghost-fire

Conflicts:
	app/controllers/welcome_controller.rb
Merge branch 'master' of github.com:blakeeb/ghost-fire