rm socket io(!)
Merge branch 'master' of github.com:zuzak/cinequeue
Added fs.link conf to link file URLs in browser
Remove double-printing of directory names
Merge branch 'master' of git://github.com/danharibo/cinequeue