indentation in .jshintrc
added grunt watch task
added simplemocha to grunt tasks
First server smoke tests with mocha
Merge branch 'mocha-tests'