Don't make pep8 cry.
Move mock to test-requirements for Python 2.x
Let's break this in both 2.7 and 3.3. -.-
Don't install Zenity when testing