Removing long-unused import infrastructure, updating rake
sigh, I guess I just didn't feel like it