kr 2
Merge remote-tracking branch 'jwhonce/wip/refactor' into refactor
kr 3
kr 4
Move integration tests
Merge pull request #2 from pmorie/refactor

Move integration tests
WIP geard packaging