Cloned from yours, merged in all future fixes performed

Since we should be cloning this one rather than Mikey's branch, I merged all of the Mikey fixes plus some others and pointed to the Jazinga repo in the README.