Squashed commit of the following:

commit 248b09641d7dc62c2a6f4b1b6cf58554f5c2d99a
Merge: 58d0a98 8818532
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Tue Aug 28 12:31:36 2012 +0100

    Merge branch 'hotfix/0.2.1' into develop

commit 88185320a8bd41514695cbdf1e6a6194cc1ca769
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Tue Aug 28 12:30:58 2012 +0100

    Version bump

commit a1e5fdddda9f752482caa0ffb744c77f5ecd9ac0
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Tue Aug 28 12:30:51 2012 +0100

    Bug fix

commit 58d0a988a96b0a643c17dacc934537959484193a
Merge: 4d4db99 db7eddb
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 16:05:50 2012 +0100

    Merge branch 'release/0.2' into develop

commit d9c49623806c2b93f8ad59fa0739f21d2562adf0
Merge: d7ae0f3 db7eddb
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 16:05:30 2012 +0100

    Merge branch 'release/0.2'

commit db7eddb4ea311bee68620f94d6de1d23ec4d2b86
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 16:05:20 2012 +0100

    Updated version number

commit 4d4db99c06d0414f77a5b3af3489c65c66212f59
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 16:02:54 2012 +0100

    Underscored private variables and methods and updated references

commit b485f15e835f20330a4e195ac75f673691b3a0e2
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 16:02:35 2012 +0100

    Fixed reference to renamed methods and properties

commit c92dc8f759a9fa8a75c5153d466e01eac150e766
Merge: 8f20659 c058804
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 15:52:21 2012 +0100

    Merge branch 'release/0.1' into develop

commit d7ae0f316e6ba68e3c8ca717f432496938280cd1
Merge: 5a98658 c058804
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 15:52:20 2012 +0100

    Merge branch 'release/0.1'

commit c05880471c23d3c6c8d96b71cb5dafd5024e8d48
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 15:44:06 2012 +0100

    Updated composer.json

commit 8724a1efb07e60008a38d741358a5e2d064c5623
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 15:43:26 2012 +0100

    Updated composer.json with new version

commit c89fe5bdf8563c688fce334d2cd177a6205a9442
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 15:43:17 2012 +0100

    Updated README

commit 8f20659f1d8eeb05640a7d690436f406b99ad6d8
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 15:25:59 2012 +0100

    Check for correct exception messages

commit 7341d5ddc8b479a398f88785993affac8bedb6e4
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 15:25:41 2012 +0100

    Moaaaare tests!

commit 7a4aece507ace9f7ce7a02f3e89bae35b7fe25cf
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 15:25:28 2012 +0100

    Stylistic fix

commit b7d73accdcc3dfac9605be91b615578421fd37cd
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 15:25:14 2012 +0100

    Removed old die statement

commit 5da908841045999a152265982229683cfbb2d97a
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 14:43:12 2012 +0100

    Assert that mock database objects are proper instances of their interfaces

commit 337b2e0a928ad96497096261322884c745de19f1
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 14:32:06 2012 +0100

    Marked test_init_header as incomplete

commit 3642b8432ee1ab6b3b8cb85fa93f8bdbec7f803c
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 14:25:24 2012 +0100

    PHPCS fixes

commit e191566260e12a16dc6a6a9847003bfd144d48cf
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 14:25:18 2012 +0100

    Fixed errors with handling database calls

commit 95931abd6b6d06c093e86e4b11c0c39322bf0cc6
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 14:24:43 2012 +0100

    Spelling fix

commit 3ab511f2f72e2518658b964091fde8cbfb252c60
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 14:24:32 2012 +0100

    Spacing fix

commit 3e7b471e757383d9120aed0d6b9e92f1ad9ec14d
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 14:23:50 2012 +0100

    Lots of beautiful tests

commit 00562858f9d3d878c14638a0ba35fc609c50f7c1
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 27 14:23:26 2012 +0100

    Excluded Composer autoload

commit 9e0115732447e3b6a9232afa9015608e89081d48
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Fri Aug 24 12:26:13 2012 +0100

    Updated .gitignore

commit 465c1c6ab2a4508ef4410488c1267329aa64366b
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Fri Aug 24 12:25:31 2012 +0100

    Wrapped getallheaders() method in function_exists (function isn't available on command line)

commit 87ec05dba6d08450f30afa5cedf56bf9a5b81390
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Fri Aug 24 12:24:55 2012 +0100

    Corrected namespace

commit b987c71820dd0227ee04a3caa0dd3ba91abdf932
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Fri Aug 24 12:23:16 2012 +0100

    Renamed test classes

commit 829735aeebf5e08d6586f487e0da6ea46ebe3ea3
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Fri Aug 24 12:23:04 2012 +0100

    Update .gitignore

commit e8962f543db589075a01932fdfb91a5d6b7381e8
Merge: 9933bde 2c3e842
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Fri Aug 24 12:21:30 2012 +0100

    Merge branch 'refs/heads/feature/resource' into develop

commit 2c3e8427027661f0c542eb589839b26bea9bdd85
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Fri Aug 24 12:21:11 2012 +0100

    Updated .gitignore

commit f53f6ca6097e08ae48df5ed20cad1903c8d57952
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Fri Aug 24 12:19:31 2012 +0100

    Added .gitignore

commit 81a7322933001ee45d4525f301dabf5787a894c9
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Thu Aug 23 12:22:39 2012 +0100

    Started resource server unit tests

    TODO: authentication header test

commit 66ee8df5b178b19fae1fc287463e415fec5faf78
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Thu Aug 23 12:22:16 2012 +0100

    Added database mock for resource tests

commit 78424ce100dfe7c07c6d9c9951f642154ebbbce3
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Thu Aug 23 12:21:59 2012 +0100

    Added resource server test suite

commit 326e96cc1787a724015d3f65750d923e80af964d
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 20 15:49:57 2012 +0100

    Bug fix in dbcall

commit 6fdb6177bcdc9cfd81a43217ebc07608f5b0010c
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 20 15:09:33 2012 +0100

    Lots of fixes

commit ed3238b862b16e5d3b83a236581cd651530ccdd9
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 20 14:19:33 2012 +0100

    Fixed constance letter casing

commit 9933bde7d8195b26ba706abe6efd2f770d67f1b3
Merge: b67a804 176c678
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Wed Aug 15 11:08:43 2012 +0100

    Merge branch 'develop' of github.com:lncd/OAuth2 into develop

commit 519d20f0a51b09fd009d579fb54b1696bee19ae8
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Tue Aug 14 16:34:43 2012 +0100

    Changed indent to spaces

commit e859f435a17ad6db7cb9fb8823417510f7d29a16
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Tue Aug 14 16:28:40 2012 +0100

    Added docblocks for the database interface

commit 77ce18df56dc5896bad64cf26fc14fbc27e20d73
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Tue Aug 14 15:46:58 2012 +0100

    Added the resource server database interface

commit 8720de48de790695f3c867d2e0a0068131e35d84
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Tue Aug 14 15:44:25 2012 +0100

    Initial update with some PSR-* changes

commit 176c678c23879f039e4bcf5e035a1b92adf6f5fa
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 16:13:27 2012 +0100

    Don't remove composer.json and vendor dir

commit d743412cf7b85095a2ad4dccc142de3331c3d6ec
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 16:10:22 2012 +0100

    Trying to get phpunit to log somewhere sensible

commit 1a925788e61d7672f9d16fc5d64ff35705d25887
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 16:06:03 2012 +0100

    Fix for phpunit log paths

commit 095ea72b627af7a7e97a0d14970763e9f85c6c09
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 15:57:57 2012 +0100

    Added composer install

commit 9aa8f86f3ada2a7fe6036d4d1bafb846a04b9561
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 15:53:10 2012 +0100

    Remove the composer.lock file and the vendor folder

commit 7c7dfec4c45b804c545a61ac6cee76c95bd4bbcd
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 15:48:33 2012 +0100

    Execute the local phpunit

commit 30ef11c1d78294bc0ee0d9e39c9db6660c306c94
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 15:32:35 2012 +0100

    ALL OF THE TESTS!

commit a9e816f336868e333b96c5ff2a5ecb7faaab2115
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 15:32:25 2012 +0100

    Updated name of project and build location

commit 770580556811fe93b2cf8dc55e14522811656099
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 15:32:11 2012 +0100

    build sh tool location fix

commit 95068c5176dae54fd49b565f0d1f2534d1f7e2f7
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 14:42:58 2012 +0100

    Lots of fixes following errors found from unit tests

commit 983c1faf0a61fc7ba0bd83c2bf61928628ba79a9
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 14:42:18 2012 +0100

    Updated build.xml to run PHPUnit

commit 7ea3a045cd31b6880f4180e16b2260513f697bc8
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 14:42:02 2012 +0100

    Moved the phpunit.xml config file to the build folder

commit 2e315fc257c584b5c11184afbab9f5cac65f54b6
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 10:59:36 2012 +0100

    New tests

commit a5f019ad19bc400ced6762a0efd85785a470f17c
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Mon Aug 6 10:59:20 2012 +0100

    Call database methods via the dbcall() method

commit c17cd7b1cc01f65bd7d9755d94f08af7e1cd0d29
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Sat Aug 4 09:12:12 2012 +0100

    Fixed variable reference bug

commit bfab30061efba38a9215e33dff8a5cafc76b8fae
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Sat Aug 4 09:11:39 2012 +0100

    Spacing fix

commit 0748ba379b830e4ca39b0c9fb94f8ba29bf3a8cb
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Wed Aug 1 17:15:48 2012 +0100

    test executable

commit 1409df6eb40b07ad33169777cd128b56f31c4bad
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Wed Aug 1 17:15:29 2012 +0100

    Started adding tests for auth server

commit d0bb79bd7cd04247229373779eeb33a1149f3d57
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Wed Aug 1 17:15:16 2012 +0100

    Added phpunit.xml

commit 9935cc5d2119ff8544013a0333a804e09b7a8438
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Wed Aug 1 15:44:03 2012 +0100

    JSON error fix

commit 93772d0f7068f80ba405a22dc381070efb18b320
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Wed Aug 1 15:41:41 2012 +0100

    Require PHPunit in dev composer mode

commit 5ef85e53af4ab04579c839403bd35f4b8bd88159
Author: Alex Bilbie <alex@alexbilbie.com>
Date:   Wed Aug 1 15:41:24 2012 +0100

    Removed old test file