Merge branch 'master' into origin/abby
Merge branch 'master' into origin/abby
EOR complete

Everything all set for testing!
Merge pull request #57 from cgoodling/origin/abby

EOR ready for testing!