merged master branch into add-maven-install but it really is just accepting all of Erics changes