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
Update haml gem for namespacing issue introduced with rails 3.2.17 && dependencies upgrade
Remove explicit ruby version declaration - - for another day.
Merge pull request #54 from zkay/dev

Upgrade Rails => 3.2.17, rails_admin, misc dependencies.
Merge remote-tracking branch 'upstream/master' into upgrade-rails-admin

Conflicts:
	Gemfile
	Gemfile.lock
Merge pull request #51 from phiggins/upgrade-rails-admin

Upgrade rails admin
Merge remote-tracking branch 'upstream/master' into fully-switch-to-strong-params

Conflicts:
	Gemfile
	Gemfile.lock