Purge .rvmrc from the readme and mention rbenv
Refactor bootstrap script for readability
Merge branch 'refactor-bootstrap-script' of https://github.com/ohrite/bridge_troll into ohrite-refactor-bootstrap-script
Make ruby-version work with rbenv
Revised version of Learn/Vol buttons for signed out users.

* Show the 'Sign In' form as a modal instead of going to another page
* Show the Learn/Volunteer buttons in their own "RSVP" column rather
  than hijacking the Location column

This required some somewhat shady js layered on top of bootstrap's
  rather anemic modal. Check out sign_in.js.coffee for some fun.
Merge branch 'ruby-version' of https://github.com/fionatay/bridge_troll into fionatay-ruby-version
Minor refactors associated with another branch

* https://github.com/railsbridge/bridge_troll/pull/152
Clean up bloated request spec
Update README.markdown

* Document the style guide
Merge branch 'cleanup-spec' of https://github.com/fionatay/bridge_troll into fionatay-cleanup-spec
Merge branch 'update_readme' of https://github.com/fionatay/bridge_troll into fionatay-update_readme
Events now have a required student_rsvp_limit field
Students that RSVP for full events get put on the waitlist
Prompt user to connect Meetup.com account
Reorder waitlist if RSVP is destroyed or rsvp limit changes
Merge branch 'prompt-meetup-connect' of https://github.com/fionatay/bridge_troll into fionatay-prompt-meetup-connect

Conflicts:
	db/schema.rb
Update poltergeist to avoid requiring specific faye-webservices version
Fix unusual navbar link behavior in Firefox

In Firefox, nav links can get stuck in :focused state by
click-dragging on them, or clicking them then navigating 'Back'.

Previously, this would show the button as grey (on a grey bkg).
Now, it shows as the 'hover' color (orange).

Fixes #157
Fix student_waitlist_rsvps to be more likely to work in postgres
Changes to event time display on homepage

Upcoming events show times for each session as '[date] from [time-time]'
Old events just show the date of the last session