Merge branch 'master' of github.com:Kazade/delimit
Watch for new files and update the tree as necessary