Merge branch 'non-root-install' of github.com:ged-lab/2012-paper-diginorm into non-root-install