Simplify deploy by moving coordinate merging into aether

Use the changes in https://github.com/cemerick/pomegranate/issues/52 to simplify the deploy task.