cherrypicked master for capybara stuff
Merge branch 'pull_capy' of github.com:ksilin/skilda into pull_capy

Conflicts:
	spec/homepage_spec.rb