Premerge
Merge branch 'master' of github.com:robsci/resonance-char-paper
Attmept to clear up the averaging