MANTA-1 (cleanup in response to feedback)
MANTA-1 (cleanup in response to feedback)

davepacheco/manta-marlin,davepacheco/manta-marlin,joyent/manta-marlin,davepacheco/manta-marlin,joyent/manta-marlin,joyent/manta-marlin