Merge pull request #17 from jasnow/master

Rebuilt Gemfile.lock file; fixed cuke gem line ; removed .travis.yml~ te...
Merge branch 'master' of https://github.com/gmacie/civicspaces