Add a dummy wp-cli.yml file
Merge branch 'master' of github.com:markjaquith/WordPress-Skeleton
Add a default plugin for site specific tweaks.