Merge branch 'upstream'

Conflicts:
	Rakefile
	app/config/initializers/setup_neo4j.rb
	app/models/person.rb
	app/server.rb
	app/views/skill/list.erb
	spec/spec_helper.rb
Merge branch 'master' of github.com:ksilin/skilda

Conflicts:
	Rakefile