Barcode handling using unicode rather than str, because python2's default choices are silly
Merge branch 'master' into ninjatune-release-dates

Conflicts:
	geordi/geordi/data/mapping/indexes/ninjatune.py