Remove new/old @Title stuff again
ISE feedback: make template.xml actual compile

template.xml wasn't valid XML. Changed this so it is and can be used
as a starting point for would-be authors.
Update changelog too
Resolve conflict