Rename each_with_index to each_row_with_index
Remove with_index from each_row_with_index
Move all fixtures to test fixtures and remove duplicates
Fix integration test
Consolidate all 'set year from :year param' code into one place
Fix test
Merge master