Sprinkling around some pyflakes
Merge pull request #485 from seandst/cfme-flakes

Sprinkling around some pyflakes