Squashed commit of the following:

commit a7879d2749faab2b67fbf2f8d1c17e1bae2f3cb3
Author: Rob McVey <robmcvey@gmail.com>
Date:   Mon Jun 30 14:41:38 2014 +0100

    Merging in flickr functionality

commit 0850d7a8489e28a52999e68aaa87bc51afae3230
Merge: 363c99c 7466280
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Jun 17 14:09:37 2014 +0100

    Merge branch 'master' of github.com:copify/copify-wordpress

commit 7466280588a40d82c21c4c89ed937be44f3b1431
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed May 14 11:49:51 2014 +0100

    Use esc_attr() rather than htmlentities() in brief

commit aae02c000dc73ca2fc6391187936d06282e5963b
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed May 14 11:46:40 2014 +0100

    Use esc_attr() rather than htmlentities()

commit 5083284ea753777182a630727fbae907bba0b392
Merge: 6fee5db 6e8f2f6
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed May 7 14:20:20 2014 +0100

    Merge branch 'master' of github.com:copify/copify-wordpress

commit 6e8f2f6a3f5f2e435a6ebd4d0a75c0f6ead5ce84
Merge: fff6a52 60cb22c
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed May 7 14:15:25 2014 +0100

    Merge branch 'master' of github.com:copify/copify-wordpress

commit fff6a52e740998b5fbe27bc479876340b0b14c2d
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed May 7 13:58:28 2014 +0100

    Checking version, base path, ready...

commit eeb9dac42b2321bad5d9fd491e1287662c640c25
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue May 6 18:35:18 2014 +0100

    Minor change to return JSON when auto publish complete

commit 8bfd7857f735871ca8813722d73e32b8d962def7
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed May 7 14:13:43 2014 +0100

    Conflicts fixed

commit f14aebb04e4b99a89e7056e323b6301dfa571103
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed May 7 14:09:34 2014 +0100

    Fixing conflicts

commit 60cb22c114789c7daeb0a89322f792a5d720d266
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed May 7 13:58:28 2014 +0100

    Checking version, base path, ready...

commit ceda3754eacbf0ef065ceb74fd0f80d5bcc31377
Merge: bea2939 bb8c671
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue May 6 18:48:44 2014 +0100

    Merge branch 'master' of github.com:copify/copify-wordpress

commit bb8c671358edaab6136091cc4b148f676a7c9ff3
Merge: 5017f90 c17858b
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue May 6 18:37:33 2014 +0100

    Merge branch 'master' of github.com:copify/copify-wordpress

    Conflicts:
    	CopifyWordpress.php

commit 5017f90de52609020bd2c282a1db80280b28987a
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue May 6 18:35:18 2014 +0100

    Minor change to return JSON when auto publish complete

commit c17858bb1f1c1865b6e22b56332a00fd7c2a6d24
Merge: c64b47d 1b01950
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Apr 30 18:05:18 2014 +0100

    Merge branch 'master' of github.com:copify/copify-wordpress

    Conflicts:
    	CopifyWordpress.php

commit c64b47d3ad1bf3297c4929115a2e1e8cc74acf83
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Apr 30 18:01:51 2014 +0100

    Check version requires a token

commit c58f362255e1388db5798adaad8de04aa4ffe2b7
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Apr 30 11:57:20 2014 +0100

    Meh.

commit 2f15b69ee9042f97c8fa38c2f5ebb2c8b81e6bad
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Apr 30 11:56:22 2014 +0100

    absolute url

commit 92595fc3bbcf753d7ec03f666543ca9b16691990
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Apr 30 11:53:15 2014 +0100

    Works?

commit 93816bef78807f2c3167bce4441a23b720d84e85
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Apr 30 11:51:26 2014 +0100

    Relative img url to assets branch banner

commit 1b019503d8ecbb0d28cb275e2af9501cbd1a7ae4
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Apr 30 11:57:20 2014 +0100

    Meh.

commit 8e1f5cbb6be8aec9e721ab816353875d4f334a80
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Apr 30 11:56:22 2014 +0100

    absolute url

commit c3f5a66893422c089a5440c751a4b1da9094c9b6
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Apr 30 11:53:15 2014 +0100

    Works?

commit 3c3356820d0aaf3fc5bf06e76706601a211b4edb
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Apr 30 11:51:26 2014 +0100

    Relative img url to assets branch banner

commit c7c22ac726ed499341d69c1527fe9b750b4a9e0d
Merge: f0cd019 6c6afb5
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Apr 30 11:44:50 2014 +0100

    Merge branch 'master' of github.com:copify/copify-wordpress

commit f0cd0193b27865fc3a085842d18c55459d5d9b59
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Apr 30 11:44:37 2014 +0100

    Allow version check

commit 6c6afb5ac4ea2981b25ce8701e357cf9cc5eeabe
Merge: 733244c 7e456e7
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Apr 29 15:02:34 2014 +0100

    Merge branch 'master' of github.com:copify/copify-wordpress

commit 7e456e7ded3152de41bfa02abe3f1f570adc2e56
Merge: f98179c ad86c3f
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Apr 29 15:01:12 2014 +0100

    Merge branch 'master' of github.com:copify/copify-wordpress

commit f98179ca2b5b9b7bf17776be9fd485af032a6926
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Apr 29 15:00:51 2014 +0100

    gizignizzle

commit ad86c3f4f1d8e6b637dfc87b8841aa70f964bb8c
Merge: 1564e22 15fcd29
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Apr 29 14:56:16 2014 +0100

    Merge branch 'master' of github.com:copify/copify-wordpress

commit 1564e2278632dc150a239ef577314474bb5d01c6
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Apr 29 14:56:02 2014 +0100

    Assets moved to seperate branch

commit dfdcb9bbd7762905527fe3b4e8f78271f4ae0905
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Apr 29 14:09:04 2014 +0100

    Removing bold from readme

commit 15fcd29152306f98e67ee516b82a066164df396e
Merge: dffac27 6fa8f80
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Apr 29 12:47:37 2014 +0100

    Merge pull request #8 from copify/packages

    Adding functionality for auto-publish

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