Added a default value for short_circuit var if none is specified
Merge pull request #27 from pophealth/short_circuit_default

Added a default value for short_circuit var if none is specified