Only build master on Travis
Fixed comment test in PHP renderer
Added support for multiple templates in addCustom()
Merge branch 'master' into phpBB-compare
WiP