WIP; also merge from trunk up to and including bug 1066184.
WIP
Some changes from glob's first feedback
Rename files to eliminate warnings from multiple includes.
Reorganize "About", and make all TODO items more clear using todo extension.
WIP
WIP
WIP
WIP