Improve options

Make useExtends required only when using defaultExtends. This allows for mixing normal template use with extends
Remove undesired swap files