initial tests
Merge branch 'master' of github.com:heynemann/nose-docker

Conflicts:
	.gitignore