Add experimental dev and test targets
support newer version of tornado templates