revise how we're implementing the dicts
clean-up
re-dict the rankings tuples
fix issues with printing to terminal
Merge branch 'report' into rankings

Conflicts:
	parse.py