updated to current master and merged changes
updated to current master and merged changes

blackpioter/sendgrid-python,sendgrid/sendgrid-python,blackpioter/sendgrid-python,galihmelon/sendgrid-python,sendgrid/sendgrid-python,galihmelon/sendgrid-python,galihmelon/sendgrid-python,blackpioter/sendgrid-python,sendgrid/sendgrid-python