Merge in the last of the changes before I remove the fork.

The main reason for me forking was to help out and hopefully have you pull some changes, but since you added me as a Collaborator, I don't need this fork anymore! After the rest of the commits are pulled in, I can get rid of this fork and start working on the project directly. Thanks again!