Refactoring CLI a bit.
Merge branch 'master' of github.com:polarblau/meta_wordpress