friday start
pre-merge commit
Merge branch 'master' of https://github.com/railsforcharity/spokenvote into ajax-signup-box-feb1
login error message visible, login modal closes if login modal join button clicked
Show username on support
Supporting arguments partialized
A little refactoring for voting
Improve proposal text for seeder
setting up testing environment
Merge pull request #72 from billsaysthis/ajax-signup-box-feb1

Ajax Signup
Cleanup proposal model
Expanded seeds.rb to 40 users, 10 Hubs, and 20 Proposals to enhance testing data for testing Proposal Editing and Branching
Updates to the new proposal creation page
Corrected  seeds.rb, only 7 Hubs
Merge pull request #74 from kimardenmiller/Seeding_more_usable_Users

Expanded seeds.rb to 40 users, 10 Hubs, and 20 Proposals to enhance test...
Fix seeder to use simple proposal statements
Drop locations table as it is not used
Merge remote-tracking branch 'upstream/master'