Master skeleton

Resolves https://github.com/cakephp/upgrade/issues/33 and https://github.com/cakephp/upgrade/issues/32