Sort files and directories and fix broken exclude paths.
Merge branch 'master' of ssh.github.com:Shirk/puffin