stuff - lots of refactoring for foreman
Merge pull request #10 from thomasmckay/stuff

stuff - lots of refactoring for foreman