update town-template parser.. to actually parse things.  
a few other minor cleanups (imports, formatting)