Mostly finish merge of my Turk integration changes with Taek's changes since then... need to re-merge index.html into client.html in order to pass GET params properly