Renamed HorseflyConfiguration to ORMConfiguration
Merge branch 'master' of github.com:wavicle/Horsefly