Fix views config generation
Use default open and close ejs tags
Merge remote-tracking branch 'upstream/development' into development
Use jade blocks, not layouts
Fix links to documentation
Merge pull request #623 from cacteye/development

Fix views config generation