add twitter to city
Merge branch 'master' into twitter-specific-to-city

* master:
  OK, actually unconfigure kippt
  click -> select
  Unconfigure kippt on travis
  Trying to downgrade webmock to fix failure
  Remove cucumber in favor of rspec-given
Merge pull request #49 from railsgirlslondon/twitter-specific-to-city

make twitter specific to a city
Merge branch 'master' into registration_form

* master:
  add twitter to city

Conflicts:
	db/schema.rb