Basic support + site template based on Jade
Merge remote-tracking branch 'origin/master'