Handle inconsistent template names and files
Change how annotations are sent and processed by slyd
Clean up whitespace