Simplify Time::timeAgoInWords()
fix cs
Add ConsoleOptionParser::removeOption()

When building option parsers with inheritance it is sometimes useful to
remove options that the parent class added.
Dry out options for bake.

Use inheritance to dry out duplicated options in bake tasks.
Generate the correct Plugin AppController class.

Fixes #1401
Grammar correction.
remove depreated userOffset
Adding a method to ensure the entities have the tree columsn present
Also ensuring columns for delete, unit testing
Correcting link
Merge pull request #3272 from dereuromark/3.0-time

Simplify Time::timeAgoInWords()
Merge pull request #3280 from markstory/3.0-bake-task-cleanup

3.0 bake task cleanup
CS fixes
Merge pull request #3282 from cakephp/3.0-tree-behavior-the-end

3.0 tree behavior the end