Support relocation after rebasing against upstream.
Initial set of integration tests for relocation.
Merge pull request #27 from baron1405/add-relocation

Add relocation