Update setup.py
Add acknowledgements file
Merge heads