making the tests pass on windows by ignoring line-ending differences
a much smaller fix to prevent the second layout from clobbering the first one - this is what I should have done for #10
updating to latest base files
Merge pull request #11 from nfriedly/master

Fix for documents with existing url