fix the confirmation token (broken due to devise upgrade)
update devise text when confirming e-mail address
add return_path to mailer, to try to fix gmail smtp issue
break apart the from-name from the from-email, so that we can properly re-label e-mails from commitee-members, but from the main mailer address
add rvm files, and remove database.yml
add new ruby version
update gems, and address changes for tests
fix travisCI
update travisCI database
add annotation gem
fix unpermitted parameters when creating new user object
automatically annotate models upon db:migration
create a discussion concept, to separate comments from proposals
add tools for gemfile
change from erb to haml for all view partials
initial addition of mailer previews (not complete)
stop creating records during mailer previews
rearrange welcome page, moving proposals to committee-specific pages
clean up text for Committee#index
ensure discussion has a committee