making possible for tests to run on windows
listening on 127.0.0.1 if running on windows
fixing conflicts
adding .gitignore
fixing layout in subdir
Merge pull request #35 from rguerreiro/fix-layout-subdir

Fix layout subdir