Merge in changes from my local repo

Ugh, I've been committing to my fork the last few days...