Pre-merge tweaks for #37, plus change default dataType to json.