Add pyo files to gitignore list
Merge branch 'master' into tox

Conflicts:
	.gitignore
(tox) Added flag to tox.ini