removed ls style file arguments as git does not report correctly
Merge branch 'master' of https://github.com/supercrabtree/k