Update RakeFile for Rspec
Merge branch 'dev'