Merge branch 'hotfix-failed-test-nfft'
Merge branch 'develop'
patch setup.py for later upload to PyPI
apply changes to make PyPI upload possible
ignore MANIFEST
Merge branch 'develop'

Conflicts:
	setup.py
update changelog
fix hyperlink malformation warning issued by sphinx
update autogen files
Merge remote-tracking branch 'origin/develop'

Conflicts:
	pynfft/nfft.c
	pynfft/solver.c
	pynfft/util.c
update content
fix incomplete support for attribute n
finalize draft of tutorial for NFFT usage
update autogen files
Merge branch 'master' into develop