Update my email address
Update TODO
Merge branch 'master' of github:oaubert/python-vlc

Conflicts:
	TODO