improve formatting and fix little things
Merge remote-tracking branch 'origin/master'

Conflicts:
	arraydict.py