Revert "Merge"

Reverts ocadotechnology/luigi#1