Final file/assoc image refinements
Merge branch 'humbucker' of github.com:blueriver/MuraCMS into humbucker