fixed typos in rspec
Merge branch 'arielle'
updated environment