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