ok, ok.  now really everything works again except the stupid relative imports.
better organization to contain matlab comparisons
turn some zeros into 'nan's for consistency
tentative changes for trying to match Greig's code.  may need to roll some of these back!