Refactor templates to later support converting other stuff into
macros (like batch)
Add features for working with additional macros
Merge branch 'master' of github.com:cse-bristol/jasb