Switch to curl refs #8

Cleanups