minor changes
Merge remote-tracking branch 'sebastian/master' into upstream

Conflicts:
	Gemfile
	app/models/person.rb
	app/server.rb
	spec/hello_spec.rb
	spec/spec_helper.rb
Moves Java dependency from command comment in README
Merge remote-tracking branch 'sebastian/master' into upstream

Conflicts:
	Gemfile
	Gemfile.lock
reverted db/seed.cypher & spec/spec_helper.rb
cherrypicked master for capybara stuff
cherrypicked master for capybara stuff
Merge branch 'pull_capy' of github.com:ksilin/skilda into pull_capy

Conflicts:
	spec/homepage_spec.rb
Merge pull request #22 from ksilin/pull_capy

Added capybara and first tests for the homepage
Adds shotgun dependency