fix filename output, make base+includes optional #1
beautify
Merge branch 'master' of github.com:creativelive/spook