Fix bad template includes in some templates, bump to 0.3.3