Group colors together in one static list

Will have the legend blocks and chart values access and use the static
HashMap
Merge branch 'master' of https://github.com/ttsanton/ldp-testsuite
Improvements to chart + data layout within the table.

Aligned the "labels" consistently throughout.