Use -setup for keystone searches

Resolves TA247
Merge pull request #93 from rackerjoe/TA247

Merged automatically by jenkins after successful build test