Merge Me After Merging the Pull Request from Ben

Ben's pull request contains the most update-to-date version of our code. Please merge with his pull request before merging mine.
 
I added some small changes including a working email script and some bug fixes