blindly commit windows changes
merge -- ugh, I'm gonna have to update the blog post for this again
actually merge the damned thing
final adjustments