Corrected url regex for localhost
Added coverage
user:  .feature file check
group consolidation and coverage
small beautification
eliminate flickering
Merge branch 'refactor-test-coverage'
rails bugfix fixed - remove santa
Merge branch 'master' of github.com:piffy/houserule

Conflicts:
	app/models/user.rb
	config/routes.rb