changed email addresses to those registered by amazon
Merge remote-tracking branch 'origin/master'