bring things up to the Jetpack 2.5 code base level

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