Updated api-key add message
Fixed error reporting when connection to redis cannot be established
Merge branch 'master' into heroku