move Displays_7-Segment.pretty to Display.pretty and more modifications

Can we move three footprints from Displays_7-Segment.pretty to Display.pretty and remove Displays_7-Segment.pretty? They were not sorted. I also added three new footprints and removed one duplicate.