set environment according to rack env
Trying to make travis build green
we use rake
working on travis
still trying to make travis green
ensure log dir exists
merge from development, conflict in Gemfile
use latest version of opentok
use newest verion of opentok
rename to spec and cleanup
rename file
move file
Merge branch 'development'

Conflicts:
	Gemfile
refactored tests