remove spork; cleanup spec_helper.rb

Conflicts:
	Gemfile.lock
	spec/spec_helper.rb