Remove some Ruby 1.8-specific dependencies.
Upgrade capybara from 1.1 series to 2.2 series.
Upgrade uglifier from 2.2 series to 2.3 series.
Update bundler to 1.5 series.
Update rake.
Update uglifier to 2.4 series.
Travis: Also test on Ruby 2.0.0.
Merge remote-tracking branch 'origin/master' into coop

Conflicts:
	Gemfile
	Gemfile.lock
	features/step_definitions/notification_steps.rb
Travis: Also test on Ruby 2.0.0.

(cherry picked from commit 080b862aa221641c02fd7a6c79d4c6c7b2b977a9)
Capybara 2: Make JS field observer more aggressive so Capybara can see it work.
Capybara 2: Don't be ambiguous when specifying elements.
Capybara 2: Hidden elements must be displayed before Capybara can find them.
Gherkin style fix.
Fix that 'last login' didn't show year, only day and month. Closes #455.
Merge remote-tracking branch 'origin/v1.x'

Conflicts:
	spec/views/members/index.html.haml_spec.rb
Merge remote-tracking branch 'origin/master' into coop

Conflicts:
	spec/views/members/index.html.haml_spec.rb
Upgrade simplecov to get fix for JSON format error.
Change 'From' address for notification emails to 'no-reply@oneclickorgs.com'.
Emails: Move organisation name to subject; in 'From' use OCO instead.
Add OCO contact link to footer of emails.