Works with ST3.
Make it backwards compatible with Python 2 again.
Merge branch 'origin/master'

Conflicts:
	plist_json_convert.py