add extra bhaa option fields, update importer to read username/password
from options. remove flickr classes and reformat phpFlickr