Include Capybara::DSL
Remove unneeded specs
Add sign up tests
Merge commit 'f1e4fc8459d5189048698f60ba54bc22dd9fe8f7'

* commit 'f1e4fc8459d5189048698f60ba54bc22dd9fe8f7':
  Add sign up tests
  Remove unneeded specs
  Include Capybara::DSL

Conflicts:
	app/views/users/show.html.haml