Fixed python version in travis.yml
Merge branch 'hotfix-mock' of https://github.com/PlasmaSheep/selector
Fixed typo in travis file
Merge branch 'master' of https://github.com/PlasmaSheep/selector into cleanup

Conflicts:
	.travis.yml