Merge pull request #864 from Fanael/ninja-mode.el-refactor

Ninja mode.el refactor