Merge pull request #1 from penguinJS/master

updated waddle to allow nested segment folders
Merge pull request #4 from benbrunton/master

up to dating penguin