Merge Jon's personal stuff.

This repo is where I do my personal hacking. Just merging it back in in case someone wants to look at.