checked out MANIFEST.in NEWS.txt README.rst setup.py from placeholder branch
Merge branch 'dev'