Merge fixes for -- Cf7 3p9

Update plugin to work with latest Contact Form 7 plugin -- see http://wordpress.org/support/topic/problem-with-cf7-39-update?replies=7