Add some relocation fixes
Merge pull request #661 from CartoDB/relocator-fixes

Fix relocation steps