Merge pull request #1 from rails-api/master

merge other junk into mine
fixed params generation for update and create action
Merge pull request #160 from txdavidtx/whitelisted_params_generation_in_controller_actions

Whitelisted params generation in controller actions