Merge pull request #2 from unclelarrysvan/master

Added Shoulda
cleaned pending specs
refactored shoulda spec in discipline
Added sessions
Capybara working, cleaned up valid spec session
moved request specs into feature specs
Added question controller specs.  Added question + discipline spec.
Merge branch 'master' of https://github.com/kevinweaver/weighted-democracy

Conflicts:
	config/routes.rb
	spec/controllers/questions_controller_spec.rb
	spec/models/discipline_spec.rb
Added issues and issue_disciplines
added user_mailer
fixed some routing
Merge branch 'master' of https://github.com/leequarella/weighted-democracy
Merge pull request #3 from kevinweaver/master

did a lot of great work
Steve trying to fix everything but making little progress 1/18 00:37