Merge branch 'hotfix/1.1.1'
Merge branch 'develop'
Added pypi badge to readme and index
Merge commit '2b63a6cd2005457009cbb148b36ac3ab6d008080'
Merge branch 'develop'

Conflicts:
	docs/index.rst
Removed :margin: its not valid
Removing the :target: on pypi badge, it breaks
Hopefully this looks ok :p
Cleaning docs