Merge pull request #814 from jmaas/master

Add pyflakes to the Makefile and cleanup unneeded imports
Undo removed import (item)