slight change to spec_helper so that it's also compatible with rspec v2.
updated directory name in gemspec
Merge branch 'sabat-master'
slight change to spec_helper so that it's also compatible with rspec v2.