remove temp file
add combined_competition model
create combined_competition_entry
fix views to be able to see the combined_competition pages
associate combined_competition_entry with competition (for placing data)
fix remaining specs for combined competition entry
fix remaining spec fail due to competition_id
separate overall_place from overall_place_formatted.
more work on the overall champion calculation
add tie-breaker logic for combined_competition
merge master into branch
add event_configuration setting for choosing naucc/unicon artistic scoring style
fix tests
eager load show_all associations
Merge branch 'overall_champion'
improve more caching for show_all page