Partial commit.
Merge branch 'more-work'
Extracting the library from iphoto-export.py.