killed config file; refactored code a bit; integration test nearly complete
Merge branch 'master' of https://github.com/maxthomas/hippodrome