sql fixes
Merge branch 'beta' of github.com:sunlightlabs/opencongress into beta

Conflicts:
	app/controllers/roll_call_controller.rb