Fixing conflicts

git-svn-id: http://plugins.svn.wordpress.org/copify/trunk@909710 b8457f37-d9ea-0310-8a92-e5e31aec5664
Conflicts fixed

git-svn-id: http://plugins.svn.wordpress.org/copify/trunk@909711 b8457f37-d9ea-0310-8a92-e5e31aec5664
Minor change to return JSON when auto publish complete

git-svn-id: http://plugins.svn.wordpress.org/copify/trunk@909712 b8457f37-d9ea-0310-8a92-e5e31aec5664
Checking version, base path, ready...

git-svn-id: http://plugins.svn.wordpress.org/copify/trunk@909714 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'master' of github.com:copify/copify-wordpress