Support the posibility of matches with < 4 teams.

Modify the converter util to ensure that all the columns are correctly
filled, and have Angular JS use column index rather than content
to track the items in the repeat (this is needed as the placeholder
'-' item may well appear more than once in a row).

Change-Id: I1a767a6b0409d88bd01edf41d33f9aca38eb7577