Fix up setup so that it installs right
Merge branch 'fix-setup-py' of https://github.com/hawkowl/wordgraph into hawkowl-fix-setup-py

Conflicts:
	wordgraph/__init__.py
Merge branch 'hawkowl-fix-setup-py'
Merge branch 'master' of https://github.com/tleeuwenburg/wordgraph