Update horizon to use -setup for keystone config searches

Resolves TA242
Merge pull request #98 from rackerjoe/grizzly

Merged automatically by jenkins after successful build test