Finalized Amazon program
Merge branch 'master' of https://github.com/sxmanderson/minor_hacks