Stop using deprecated rvm format, use Gemfile.
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.
Merge pull request #53 from zkay/migrationbuildissue

Comment out phil migration for dev work - - barfs on .affiliations call
Declare Ruby version explicitly - - Cedar stack demands it or defaults to 2.0.0. Good practice.
bundle update rails - - On 3.1.2
Upgrade jquery-rails, rails_admin, and dependencies to match rails 3.2.17 upgrade