Finished with setup files
Merge branch 'master' of https://github.com/fluidware/fluidsurveys-python

Conflicts:
	README.md
	fluidsurveys/__init__.py