Fixes to run 2007 and 2008
Correcting bugs for year 2009 and debugging check_consistency
temporary commit
various victor work
Fixing conflicts
Merge pull request #265 from benjello/dev

Synchro of victor's work