Bourbon infused nonsense

Sorry man, went on a bourbon roll. The commits are pretty explanatory about what I added. I'll get back to doing issue-specific stuff next time.

Says it can't merge automatically, but I think the merge should be decent. I tried it on my local copy and no big errors.