do basic fixing of django template tags

For now we just do {{ and }}

Also do some refactoring so the core conversion can be tested without
writing any files.  And update tests for changes made a while ago ...
switch staging back to the live repo