Merge pull request #942 from wpreul/master

Layouts work correctly in jade
Adding test for https stream