added test for pasword confirmation only when psw is present on update
tested pw confrim but no pw
Merge branch 'tomfbiz-test-pw-confirm' into refactor

Conflicts:
	spec/models/user_spec.rb