Merge all of Jeremy's changes to master.

I think this is how to merge the branch into Master. Wish me luck.