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: http://plugins.svn.wordpress.org/copify/trunk@940993 b8457f37-d9ea-0310-8a92-e5e31aec5664
Conflicts:
	README.md

git-svn-id: http://plugins.svn.wordpress.org/copify/trunk@941436 b8457f37-d9ea-0310-8a92-e5e31aec5664
Squashed commit of the following:

commit f82289ecb4488f3df8b2aebb458c864fabf3b123
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Jul 1 10:33:55 2014 +0100

    Another readme change

commit 347e6ecef0b0dda422819768865cc3ccdfe8bcf6
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Jul 1 10:29:52 2014 +0100

    README

commit dadbe12687a9caf207a2289adf381892ca0ba560
Merge: a7879d2 42afef3
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Jul 1 10:26:00 2014 +0100

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

commit 42afef3bd2f3dc95a501113e2725820105ed4f38
Merge: 7466280 e4925c7
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Jul 1 10:09:24 2014 +0100

    Merge pull request #9 from copify/flickr

    Restructure, tests, adding Flickr functionality

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

    Merging in flickr functionality

commit e4925c77bb737ffc0ee5a60266d2e9687808eaba
Author: Rob McVey <robmcvey@gmail.com>
Date:   Mon Jun 30 10:47:30 2014 +0100

    Coding standards

commit ec51a3ee9c31b2f27ac0c8a72009de6e66bac069
Author: Rob McVey <robmcvey@gmail.com>
Date:   Fri Jun 27 13:48:56 2014 +0100

    fix for version number

commit 7eef1ec123983772513752becc64736e1d3f43f7
Author: Rob McVey <robmcvey@gmail.com>
Date:   Fri Jun 27 13:36:10 2014 +0100

    Version 1.0.5 Flickr Images

commit b527058e390edd57d7e2e5716093b9cca17c5745
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 25 09:38:37 2014 +0100

    Typo

commit c7584d64986b4815799fa51dee6921c769774584
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 16:55:13 2014 +0100

    Version num

commit 06e2c5199b091e4b3ec0df5e740ac932801c13cc
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 16:43:46 2014 +0100

    Styling up attribution link

commit b2b4839ef4974ec8f4ffb8d8f3ab08776482661a
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 16:09:55 2014 +0100

    Coding standards

commit 21e2782ec717015241e7b6818809f7f079eba6ad
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 16:09:12 2014 +0100

    Adding attribution GET params

commit 513533faaccdebb7ff42d5cfbdcb4595f0f1fbdb
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 15:48:24 2014 +0100

    Add atrribution links after content

commit 91300f3e4576bd4bb5c55884b399839a1c83a7ea
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 14:37:59 2014 +0100

    Add methods for adding correct CC attribution

commit be91764a30e1749035dde017330e92677fb5c636
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 12:45:49 2014 +0100

    Assert CopifyBeforeDeletePost is called

commit 82f4e80e96d78c008ab5879e59642c6eb9b33683
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 12:25:24 2014 +0100

    Coding standards

commit ea0f63cba3437ee8146ca3adc520290451ad1ab9
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 12:24:12 2014 +0100

    testUnpublishPost

commit 3045044f8e2b8626798e19335eccd3bce7c67db1
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 12:09:38 2014 +0100

    testDeleteImage

commit f18f20354c09840c03c623f939e6dc04890abc90
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 11:52:42 2014 +0100

    testSetImageMissingParams

commit 13a5b9c61d6e10a6da0fb02e2849300599cfc551
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 11:49:07 2014 +0100

    testSetImageMissingParams

commit aea13034d8f031651169ab8d37f64b84d40f3dd0
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 11:44:29 2014 +0100

    testSetImageMissingParams

commit 5668f616637ceb9db05cb6685c0656579355cbe9
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 10:47:50 2014 +0100

    testCopifySetPostThumbnail removing unused

commit bb44a9e4d69d5d88f6c485978def0bc2d38dbf8e
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Jun 19 10:47:33 2014 +0100

    testCopifySetPostThumbnail

commit fc0b4768e80d31a1f148d627f6ecb30a4e022a35
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 14:06:11 2014 +0100

    Remove API Tests, coding standards

commit a02f96b59f72ad257a0c57b4dfd80a5a1ec6dc76
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 13:57:21 2014 +0100

    testCopifyFlatten

commit 74cd6f8dd30f21699634e66adc205f1a8351fb81
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 13:33:19 2014 +0100

    testCopifyAdminMenu

commit 0d83a5203b4b177b21c065a2304864498b31ee7f
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 12:54:00 2014 +0100

    testCopifyRequestOrderPublished

commit f36f70b69cc958f23f55e7aaa413475bafee37e3
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 12:44:19 2014 +0100

    testCopifyRequestNotComplete

commit 5ad9219cac42193d2ae10b7f51bfe3deeed3521e
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 11:55:37 2014 +0100

    testCopifyRequestMissingCopy

commit 82ff0b2c466b14839975c0707b78bc6bab6a5c9f
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 11:23:03 2014 +0100

    testCopifyRequestAlreadyPublished

commit d8b4c91a01372fe4d2821fb139f489d6465583e9
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 11:11:34 2014 +0100

    testCopifyRequestMissingId

commit f5502849ac790ee9c0fa8d4e60a0a1dbd050cf6d
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 11:05:29 2014 +0100

    testCopifyRequestFilterCheckToken

commit 2ce4cdfc8989138622c0fc7bac02481aa5feeac2
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 10:59:37 2014 +0100

    testCopifyRequestFilterChe

commit cc7c91ac802a5c29eac766224d520f2ea691a3ea
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 10:58:50 2014 +0100

    testCopifyRequestFilterTokenMisMatch

commit fee53fed9d3e2c87ff85dd4627128294a82bd8fe
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 10:53:46 2014 +0100

    JSON encode is now in its own function

commit 6fa1be97848a57570cbc358a13953eda9fc42f49
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 10:50:54 2014 +0100

    Tests for request action

commit af949f9397d18715a106bb9d9a7d4cc582bdcb48
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 10:20:17 2014 +0100

    Tests for settings method

commit a32725c3689aedb79ecc76d03b6110c536ec120c
Author: Rob McVey <robmcvey@gmail.com>
Date:   Wed Jun 18 09:29:24 2014 +0100

    Coding standards

commit cd295785593747ed4a5dd3fbc552d966b354792f
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Jun 17 17:27:05 2014 +0100

    Coding standards

commit 2421381d28e722d68579f9401c0511b5935e6ee7
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Jun 17 16:46:41 2014 +0100

    Adding tests for testCopifyCssAndScripts

commit 5ed0310e28854b4a155026466f19bcc69cf7c41b
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Jun 17 16:27:12 2014 +0100

    Add build status to readme

commit 852754141749041e2aae8ad10d5625addfb51cbf
Author: Rob McVey <robmcvey@gmail.com>
Date:   Tue Jun 17 16:24:02 2014 +0100

    Restructing lib files, adding tests

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: http://plugins.svn.wordpress.org/copify/trunk@941437 b8457f37-d9ea-0310-8a92-e5e31aec5664
Conflicts:
	basics.php
	copify.php
Merge branch 'svn'

Conflicts:
	basics.php
	copify.php
small readme change regarding screenshots
Changin screenshot text