Proper return for affiliate_wp()
Merge branch 'master' of github.com:pippinsplugins/Affiliate-WP