Fix for issue #73

Also a graphing fix.  This looks to have fixed the output error for the data-cleaning.py script.  Re-running all the new stuff now.