Fixing conflicts with Jetpack, misc. warnings.

git-svn-id: https://plugins.svn.wordpress.org/voxpress/trunk@836327 b8457f37-d9ea-0310-8a92-e5e31aec5664