Added @wip around broken cukes so now no failed tests for 'rake'
Rebuilt Gemfile.lock file
Rebuilt Gemfile.lock file
Upgrade .rvmrc to p353 and rails to 4.0.1; Rebuilt Gemfile.lock file
Upgraded to Rails 4.0.2/Security fix; Rebuilt Gemfile.lock file
Fixed Merge conflict and merge branch 'master' of https://github.com/gmacie/civicspaces
Got new Gemfile; Regenerated Gemfile.lock file
Merge pull request #15 from jasnow/master

Upgraded .rvmrc to p353; Added @wip to make green cuke run; Rebuilt Gemfile.lock file.