I forgot to mention that I've added in a custom column in Calibre so I can identify which books have come from Amazon. This is useful to know if I ever get a new kindle for example and need to download those files again. Just a thought.
How to:
http://www.kinworm.com/2010/09/ebook...n-calibre.html