Merge branch 'master' of https://github.com/ashleygwilliams/policycompass
Merge branch 'master' of https://github.com/ashleygwilliams/policycompass
Merge branch 'master' of https://github.com/ashleygwilliams/policycompass
Some view cleanup/name changes.
fixed candidate pluralization
Added a basic onboarding questions view.
Merge branch 'master' of https://github.com/ashleygwilliams/policycompass

Conflicts:
	config/routes.rb
A few bits of the onboarding
Added feed to static_pages.
fix votercategory migration with null=> false
added seed script, run rake db:seed to use
fixed typo in seed script, added developer gems
Merge branch 'master' of https://github.com/ashleygwilliams/policycompass
Merge pull request #11 from adambray/master

added seed script, candidate pluralization
Merge pull request #10 from futuraprime/master

More static page views
Merge branch 'master' of github.com:ashleygwilliams/policycompass

Conflicts:
	app/models/org.rb
add Org forms