Stop using deprecated rvm format, use Gemfile.
Remove empty asset files.
Remove asset gems.
Merge pull request #43 from phiggins/remove-asset-gems

Remove asset gems
Merge pull request #47 from TLynam/past

Show past talks. Closes #29
Installed strong parameters gem and converted controllers in preparation for Rails 4.
Merge remote-tracking branch 'upstream/master' into specify-ruby-version-in-gemfile

Conflicts:
	.rvmrc
Merge pull request #42 from phiggins/specify-ruby-version-in-gemfile

Stop using deprecated rvm format, use Gemfile.
- Fixed Gemfile for bundler 1.0.7
Merge pull request #48 from kylerippey/strong_parameters

Installed strong parameters gem and converted controllers
Fixing subscription controller that I broke...
Remove extra whitespace
Merge pull request #50 from kylerippey/fixing_newsletter_subscription

Fixing newsletter subscription that I broke
Comment out phil migration for dev work - - barfs on .affiliations call
Gem source is https now.
Turn off mass assignment protection, turn on strong parameters.
Use strong params in TalksController.
Gem source is https now.
Update rails_admin to latest version supporting rails 3.x.
Update rails_admin to latest version supporting rails 3.x.