Smaller refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	mousetracking/mousetracking.py
	video/filters.py