Use 4 spaces for indentation
Use variables for colors and labels. Fixes #31

And standardize variable names
Merge branch 'master' into refactor-json

Conflicts:
	code/analyse.py
Merge pull request #33 from Datafable/refactor-json

Use variables for colors and labels in charts