institutes rspec
Merge branch 'master' of https://github.com/suryaganni/sti

Conflicts:
	Gemfile.lock
	spec/spec_helper.rb