Merge branch 'juliema'
Write results table out to foo.results.txt
fix conflict
Merge branch 'master' of https://github.com/juliema/TRAM