Bumped versions for machado and wpapi-php
&$% merge conflicts