JSHint passes on server.js, which is now included in tests, but JSCS not passing yet...
Merge branch 'master' of https://github.com/paazmaya/naginata.fi