Adding list options to servers
Modifying acceptance test
Fixing broken test :mag:
Moving calls to client helper while I'm at it
Moving 1 call to fake service client
Removing _site stuff
Merge pull request #236 from jamiehannaford/server-list-opts

Adding Server list opts
Making server action result types more consistent
Modifying acceptance tests
Separating rebuild result type from other actions
Fixing conflicts