Merge pull request #20 from jasnow/master

Added auto-deploy to Heroku feature to .travis.yml file; Rebuilt Gemfile.lock file
Merge pull request #21 from jasnow/master

Upgrade app to Rails 4.1.0.beta1
Merge branch 'master' of https://github.com/gmacie/civicspaces