comment removed
more pythonic code
fixed bug
pep8 fix
some fix
Merge branch 'pr/1'

Conflicts:
	wordlist.py
Merge pull request #4 from dbonadiman/master

Code is more pythonic