Don't clobber bottle's response object and fix some whitespace issues
Don't clobber bottle's response object and fix some whitespace issues

hugs/appium-old,rsalvador/appium,hugs/appium-old,rsalvador/appium