updating gemfile to include a newer version of ruby that heroku seems to want
adding secrets.yml back because heroku needs it
changing websocket rails away from localhost
changing websocket rails away from localhost
merge fixes