cauterizing ssl until some future point
Merge remote-tracking branch 'origin/cleaner' into cleaner
oauth headers fixed.