Merge branch 'develop'
Changed the sleep 'magic-number' to a lower (tough reasonably large) quantity. The rationale behind this 'large' sleep time is to provide a simple way to capture ctr-c command in python without much hassle with threading, not breaking the 32-bit int limit like the previous value.
Changed main script to expose better command-line behaviour (parameters, help, stuff... you know)
Merge github.com:jmcotelo/acequia into develop