Merge remote-tracking branch 'bartonp/master'
add more tags
Add Canon MakerNotes; misc fixes & improvements