Imported recent work in Maneage, minor conflicts fixed

Only two small conflicts came up:

 * The addition of the hardware architecture macro in 'paper.tex' (which
   was removed for now, but will be added as the referee has requested
   within the text).

 * The usage of "" around directory variables in 'paper.mk'.

1 files changed, 0 insertions, 1 deletions

diff --git a/paper.tex b/paper.tex
index c1d7b34..febd346 100644
--- a/paper.tex
+++ b/paper.tex
@@ -91,7 +91,6 @@ Data Lineage, Provenance, Reproducibility, Scientific Pipelines, Workflows
 
 
 
-
 % For peer review papers, you can put extra information on the cover
 % page as needed:
 % \ifCLASSOPTIONpeerreview