fix rspec failures
fix blocks ending in rspec tests
edit user page and redirecting
spork bootstrap
Merge branch 'updating-users'