Merge pull request #9 from rackerlabs/horizon_changes

Horizon changes