remove some defs that were producing useless results anyway
Fixes #277
code formatting changes (indentation and untabify)
Merge branch 'master' into fmcs_port_21Feb2014
support completeRingsOnly and ringMatchesRingOnly from Python
update to assertEqual (no reason to dig the python3 hole any deeper