Squashed commit of the following:

commit 6518bf478d37a105142f19c17d4d16c691d76be5
Merge: f3ec87c 821efd2
Author: Massimiliano Arione <garakkio@gmail.com>
Date:   Tue Jan 21 10:06:00 2014 +0100

    Merge branch 'master' of github.com:Bee-Lab/json-pretty

    Conflicts:
    	src/Camspiers/JsonPretty/JsonPretty.php

commit f3ec87cc4febcbb7a0545f1872c08eb8f842bc60
Author: Massimiliano Arione <garakkio@gmail.com>
Date:   Tue Jan 21 10:03:29 2014 +0100

    enhancements:

    * enhance handling of strings in prettify
    * handle correctly cases for '[]' and '{}' in prettify

commit 821efd2ef8902c703e75c869360f82c47d44ec18
Author: Massimiliano Arione <garakkio@gmail.com>
Date:   Tue Jan 21 09:55:20 2014 +0100

    cs fix

commit 3adacd73528a169711f5be93f3968b48ce3b4351
Author: maurodalatri <m.dalatri@consultingalpha.net>
Date:   Tue Jan 7 09:29:44 2014 +0100

    Fix for php 5.3

commit e129e1904bd386af403baa06cf352e8e1ae24952
Author: maurodalatri <m.dalatri@consultingalpha.net>
Date:   Fri Dec 13 15:04:21 2013 +0100

    Minor Fix

commit 92f7157d8c67c0aaa5a6f9e57d255d871469be60
Author: Massimiliano Arione <garakkio@gmail.com>
Date:   Fri Dec 13 13:56:13 2013 +0100

    Update composer.json

commit 6ce305774b25ab6391585ae25e24416845becfa4
Author: maurodalatri <m.dalatri@consultingalpha.net>
Date:   Tue Dec 10 08:57:38 2013 +0100

    Fix for php 5.3

commit 7ea1c767e653a487559403af82dc11c12b2bd108
Merge: d9e5d1e 7ecb300
Author: Cam Spiers <camspiers@gmail.com>
Date:   Tue Aug 27 07:22:46 2013 -0700

    Merge pull request #1 from hglattergotz/indentfix

    Add parameter to allow customization of indentation

commit 7ecb300b9b9181c4ebd437536a8afcf1be19d133
Author: Henning Glatter-Götz <henning@glatter-gotz.com>
Date:   Tue Aug 27 14:06:24 2013 +0200

    Rename parameter from $indentation to $indent for consistency

commit d3e47f088a53c44f345f23c754e1178d2c9bc305
Author: Henning Glatter-Götz <henning@glatter-gotz.com>
Date:   Tue Aug 27 08:29:07 2013 +0200

    Add parameter to allow customization of indentation

    The indentation is hard coded as a tab ("\t") character, which is not
    always desirable. The prettify method should have a parameter that
    allows the caller to pass the indentation string to be used.

commit d9e5d1e9517fabcc73983ebd78f29989ba941176
Author: Cam Spiers <camspiers@gmail.com>
Date:   Mon Apr 22 15:35:40 2013 +1200

    MINOR: Lax the version contraint for pimple.

commit 738b796675d556ceda26be6c3b448cb6e31a96de
Author: Cam Spiers <camspiers@gmail.com>
Date:   Sun Feb 3 08:53:25 2013 +1300

    Minor spelling in readme

commit 9973864045ac6dbbfc321722fa65a4fb92572922
Author: Cam Spiers <camspiers@gmail.com>
Date:   Mon Jan 28 15:51:55 2013 +1300

    Change composer install insructions

commit 5768744b4d49caee418ed05bd2fb8bdab3c33164
Author: Cam Spiers <cameron@heyday.co.nz>
Date:   Mon Jan 28 14:00:57 2013 +1300

    Performance optimizations