Add support for new secrets.yml stuff
Merge branch 'rails-4' of github.com:concerto/concerto into rails-4

* 'rails-4' of github.com:concerto/concerto:
  need to do count(:all) for scoped