Add amazon affiliate stuff and get back in sync with master