Added additional fields, Devise stuff and rewrote tests to work with Capybara