Getting horizon config inline with upstream
Merge pull request #92 from galstrom21/master

Getting horizon config inline with upstream