Merge branch 'master' into tox

Conflicts:
	.gitignore
(tox) Added more flags to tox.ini
Merge branch 'master' into tox

Conflicts:
	.gitignore
(tox) Changed test database to :memory:
(tox) Fixed failing tests

Included forgotten fixtures/ dir to MANIFEST.in