clean up names
Merge branch 'feature/scale_width' of https://github.com/benFlightStats/cubism into feature/scale_width

Conflicts:
	.idea/workspace.xml