Ignore Sublime Text project configs
Replace the test runner using grunt-mocha-cli
Merge branch 'replace-make-with-grunt'
Fix conflicted files