pep8 and pylint fix
Merge branch 'master' of github.com:syre/datamining-with-python

Conflicts:
	sentimentube/database.py