Pluralize servers
Merge pull request #671 from rackerlabs/plurals

Pluralize servers