integrated with simplecov
updated rspec helper
fixed merge conflicts
included simplecov