fixes?
Merge branch 'master' of https://github.com/tlillies/vidro
Merge branch 'master' of https://github.com/tlillies/vidro
Merge branch 'master' of https://github.com/tlillies/vidro
Merge branch 'master' of https://github.com/tlillies/vidro
merge of chnages on pi
wq!
Merge branch 'master' of https://github.com/tlillies/vidro

Conflicts:
	vidro_class.pyc