Prepare setup.py for pypi submission.
Add MANIFEST.in.
Fix setup.py.
Bump version number.
Merge branch 'master' into to_merge.
Merge pull request #1 from Kern3l/to_merge

Prepare version ready for pypi.