Merge pull request #10 from DiversityTemplating/devFreeServer

Redesign.

Tests can still fail on json schema validator loading the schemas schema, but that will be handled later.
Merge remote-tracking branch 'upstream/master' into devFreeServer-minification
Style fixes