Allows users to edit settings without providing password

Previously a user could not update there settings without providing there password. Now they only need to provide a password when updating email field or setting a new password. 
Also cleaned up the sample data to maker it a bit DRYer.
it would be better still if this logic was on a model.  with custom validation
e.g. something like
```ruby
class User < ActiveRecord::Base
...
  validate :update_foo_bar, :if => password.present?
...
end

# controller

@user.update(account_update_params)
if @user.errors

```