Uncommented secret token
Merge branch 'master' into setup
Added feedzirra to gemfile