Merge branch 'dev'
Added missing wheel dependency
More badges
Merge branch 'master' into dev

Conflicts:
	README.md
Links and nicer formatting in README