reset permissions to 644 and rolling back change in attr.erl.
Merge pull request #331 from dpaterson/pull-req-master-8faf52b0de67fe2628ded806107f7e0775629c39

reset permissions to 644 and rolling back change in attr.erl [1/1]
[Security] Upgrade to Rails 3.2.11

See http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
for details.
Merge pull request #332 from jamestyj/jamestyj-rails-3.2.11

Merged by devtool for VictorLowther
add retry to bdd authentication method
add retry to bdd authentication method
add more error checking to simple_auth:request
fixing up checkin problems and adding error detection in simple_auth
Merge pull request #333 from waynepallen/pull-req-master-e86cbca9e980f879fac0d24309ddbf9254931f8b

Merged by devtool for cloudedge
Fix 6 failing user spec tests

Fixes the following spec failures:

```
 1) User should create a new instance given a valid attribute
    Failure/Error: User.create!(@attr)
    ActiveRecord::RecordInvalid:
      Validation failed: Username can't be blank
    # ./spec/models/user_spec.rb:30

 2) User should reject duplicate email addresses
    Failure/Error: User.create!(@attr)
    ActiveRecord::RecordInvalid:
      Validation failed: Username can't be blank
    # ./spec/models/user_spec.rb:50

 3) User should accept valid email addresses
    Failure/Error: valid_email_user.should be_valid
      expected valid? to return true, got false
    # ./spec/models/user_spec.rb:37
    # ./spec/models/user_spec.rb:35:in `each'
    # ./spec/models/user_spec.rb:35

 4) User should reject email addresses identical up to case
    Failure/Error: User.create!(@attr.merge(:email => upcased_email))
    ActiveRecord::RecordInvalid:
      Validation failed: Username can't be blank
    # ./spec/models/user_spec.rb:57

 5) User password encryption should have an encrypted password attribute
    Failure/Error: @user = User.create!(@attr)
    ActiveRecord::RecordInvalid:
      Validation failed: Username can't be blank
    # ./spec/models/user_spec.rb:100

 6) User password encryption should set the encrypted password attribute
    Failure/Error: @user = User.create!(@attr)
    ActiveRecord::RecordInvalid:
      Validation failed: Username can't be blank
    # ./spec/models/user_spec.rb:100
```
Merge pull request #335 from jamestyj/jamestyj-user-spec-fix

Fix 6 failing user spec tests
fix BDD method matching and delete timeout
Merge pull request #336 from waynepallen/pull-req-master-4f1516340fe3f3afae038fa6912d15bf4cfcb0cb

This pull looks reasonable and may address issues we are seeing.  I will accept and THEN test
resolve merge conflicts
resolve issues to get tests working with my code
checkpoint before pull from Chris