committing changes to encode6.py so i can pull
Merge http://github.com/Duckwad/encodey

Conflicts:
	encode6.py
Merge http://github.com/Duckwad/encodey