Change dev server to thin
Set the token to empty if the stream is not live
Updated travis.yml to use ruby 2.0
Updated gems for Rails and for ruby 2.0
Merge branch 'master' of github.com:peepoltv/peepoltv-api

* 'master' of github.com:peepoltv/peepoltv-api:
  Change dev server to thin
Merge branch 'master' into live-flag-detection

* master:
  Updated gems for Rails and for ruby 2.0
  Updated travis.yml to use ruby 2.0
  Change dev server to thin