Merge branch 'evaluation' into Parker
removing stuff
Merge branch 'Ryan-Haglund' into Parker
Merge branch 'Ryan-Haglund' into Parker
Merge branch 'Ryan-Haglund' into Parker
Merge branch 'Parker' into Ryan-Haglund