Included six.py and fixed issue 12.
Merge branch 'master' of github.com:vispy/vispy