Merge pull request #27 from hundred/master

Rails Girls London Logo
added cities
Merge pull request #35 from railsgirlslondon/general_uk_site

added cities
adds rspec-rails in development group

so that rspec instead of test-unit generators are used
Dont allow registrations
Added admin creation of cities
Move rspec into dev group to fix tests
Merge pull request #36 from railsgirlslondon/remove_test_unit

adds rspec-rails in development group
Remove coverage
Use Github style for class methods
Switch from fakeweb to webmock
Merge pull request #44 from railsgirlslondon/feature/fix_vcr

Feature/fix vcr
Upgrade Ruby to 2.0.0-p195
Upgrade travis ruby
Merge pull request #47 from railsgirlslondon/feature/upgrade_ruby

Upgrade Ruby to 2.0.0-p195
Merge pull request #41 from railsgirlslondon/remove_coverage_output

Remove coverage
Merge branch 'master' into admin_adding_cities

Conflicts:
	Gemfile
add twitter to city
Remove cucumber in favor of rspec-given
Trying to downgrade webmock to fix failure