Squashed commit of the following:

commit 5376bedf48dbe7e99ee5a42fba72c71b15ac4f84
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Wed Aug 6 15:05:38 2014 -0700

    Fix for typo

commit 78d190df10e78b1700323ce28f0c56f6982bbbe9
Merge: 749000e 2c194fd
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Wed Aug 6 15:01:27 2014 -0700

    Merge remote-tracking branch 'origin/master' into css

commit 749000e5f2576d06e23bfe4a2cf227091973a706
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Wed Aug 6 15:01:12 2014 -0700

    fix for changed generator text option

commit f1ea7cbf71f9a031bd034ebe5106b27dd35e7ecf
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Wed Aug 6 14:42:26 2014 -0700

    Fixes for jshint and jscs errors

commit b2c2de22cdc314106fd1c4d7cd38ef426282d0a5
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Wed Aug 6 14:02:37 2014 -0700

    Squashed commit of the following:

    commit 2c194fde441f6b8e207acc6d306ac5549a284b80
    Merge: 9ac95b2 f7537d1
    Author: Ian Wehrman <iwehrman@gmail.com>
    Date:   Wed Aug 6 13:01:29 2014 -0700

        Merge pull request #245 from adobe-photoshop/jrb/doc-bound-crop-api

        implement clipToDocumentBounds option to getPixmap

    commit 9ac95b2d40e3076efacf195527e4595cac504790
    Merge: 5c72be6 317592a
    Author: Joel Brandt <joelrbrandt@gmail.com>
    Date:   Wed Aug 6 12:41:56 2014 -0700

        Merge pull request #244 from adobe-photoshop/jhatwich/scale-convert-setting

        add private property to savePixmap settings to allow scaling with convert

    commit 317592a435c4835b9406066c7964181350a0ee6c
    Author: Joel Brandt <joelrbrandt@gmail.com>
    Date:   Wed Aug 6 12:37:51 2014 -0700

        make it more clear that convert "scale" setting is private

    commit cabf3c68a8e24cfc674d77f35a86b860e95f1bda
    Author: Josh Hatwich <jhatwich@gmail.com>
    Date:   Tue Aug 5 17:12:19 2014 -0500

        allow simple scaling using convert

        add documentation for .scale

    commit f7537d1a0da0917e12dac294062c4ef9b5e82f1d
    Author: Joel Brandt <joelrbrandt@gmail.com>
    Date:   Wed Aug 6 11:58:54 2014 -0700

        implement clipToDocumentBounds option to getPixmap

    commit 5c72be676076543dca6c46ba3d3d426c2a4af881
    Author: Ian Wehrman <wehrman@adobe.com>
    Date:   Thu Jul 31 17:06:42 2014 -0700

        Fix a grunt complaint

    commit 02632c0dfb76919302cd48825a451b88e7261c95
    Author: Ian Wehrman <wehrman@adobe.com>
    Date:   Thu Jul 31 17:01:44 2014 -0700

        Typo tractor

    commit 9f5bec7d687cb29da745dbd76ce1dd32cb00bedb
    Merge: d09a6c4 07d028e
    Author: Ian Wehrman <iwehrman@gmail.com>
    Date:   Thu Jul 31 16:09:05 2014 -0700

        Merge pull request #239 from adobe-photoshop/iwehrman/issue-171

        Specify a required Photoshop version

    commit 07d028e44304f3ebba5903516adbbd66c38b6293
    Merge: 6493bce 954e2eb
    Author: Ian Wehrman <iwehrman@gmail.com>
    Date:   Thu Jul 31 16:07:02 2014 -0700

        Merge pull request #243 from adobe-photoshop/jrb/version-from-ref

        access PS version via reference (for merging into PR for issue 171)

    commit 6493bcebf216dae85282155fb5721c06111fb457
    Merge: 5ad7ac0 1445e1c
    Author: Ian Wehrman <iwehrman@gmail.com>
    Date:   Thu Jul 31 15:56:43 2014 -0700

        Merge pull request #242 from adobe-photoshop/jrb/check-for-binaries

        Check for convert and pngquant binaries (for merging in to issue-171 PR)

    commit 954e2ebddd21c75fa7208ad87e783bc634939409
    Author: Joel Brandt <joelrbrandt@gmail.com>
    Date:   Wed Jul 30 21:13:18 2014 -0700

        access ps version via reference

    commit 1445e1cd416f4b00f358ee04af2ccd75d6e52af1
    Author: Joel Brandt <joelrbrandt@gmail.com>
    Date:   Wed Jul 30 19:38:43 2014 -0700

        remove private member _applicationPath from photoshop object

    commit e70cfe4307ccd2b71a330635da808bdf285bfcde
    Author: Joel Brandt <joelrbrandt@gmail.com>
    Date:   Wed Jul 30 18:52:36 2014 -0700

        downgrade photoshop-version requirement to 15.0

    commit 406e02ed9a2b2f48ab25ad30adf27257e7ca19c8
    Author: Joel Brandt <joelrbrandt@gmail.com>
    Date:   Wed Jul 30 18:52:14 2014 -0700

        check for convert and pngquant binaries, disable pngquant if not present

    commit 5ad7ac07522590b56de44d285e7be3333747a383
    Author: Ian Wehrman <iwehrman@gmail.com>
    Date:   Sun Jul 27 11:48:41 2014 -0700

        Add Generator.prototype.getPhotoshopVersion; specify a required Photoshop version in package.json; fail on startup if the current Photoshop version does not satisfy the required version

commit 79085ee9da8224849cd560baff14f943f9b0eee1
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Mon Aug 4 13:08:12 2014 -0700

    various fixes for text styles + created unique layer names

commit 45e3ac32235bbcf487a0aa016c8028adf47bf762
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Thu Jul 31 21:25:21 2014 -0700

    Fix for reversed color stops of radial gradient + support for inner shadows

commit 45347eddca110686fe939b00ea224e24fd2787df
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Wed Jul 30 17:25:32 2014 -0700

    Fix for hidden layers +  wrong gradient angle

commit 810f657d4cb8bf27d2133314d7dcaa51788abf38
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Wed Jul 30 16:19:38 2014 -0700

    Fix for font color

commit 45496e173872feb907fbf2d18a7afc38bda570fb
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Wed Jul 30 15:15:09 2014 -0700

    Fixed some issues with drop shadow

commit efc275179ae52b8a02b2c72a7f61dbbb0139263b
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Tue Jul 29 21:24:07 2014 -0700

    Fix for text-size + reversed gradient

commit 1ed7d671a707fd3e55fdfcc576502d6c917e2acf
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Tue Jul 29 17:18:29 2014 -0700

    Fix for swapped variable name

commit f0293a3c33d5189e9bab242fef7cf713a56d00b5
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Tue Jul 29 16:56:53 2014 -0700

    Integrated missing code

commit 37467471cdad84355e0c0cdd099da43f4c4f36cb
Author: sylvain-galineau <galineau@adobe.com>
Date:   Tue Jul 29 16:54:56 2014 -0700

    Adjust top/left coordinates of layers based on origin of parent group layer, if any

commit 8612d95ac1fc478fb0cad05ddc2ea50d2de15989
Author: Rik Cabanier <cabanier@adobe.com>
Date:   Tue Jul 29 15:19:06 2014 -0700

    fix for missing function + export whole doc for now

commit 3573e31a1f05dadd450581929c12bebf247253ac
Author: sylvain-galineau <galineau@adobe.com>
Date:   Tue Jul 29 15:05:39 2014 -0700

    Wire up getStyleInfo() to live data extraction

commit 4b89786284a984b04ad428465f7fabeac7ac800c
Author: sylvain-galineau <galineau@adobe.com>
Date:   Tue Jul 29 12:50:49 2014 -0700

    Add getStyleInfo(); return object in test/style.js

Signed-off-by: Rik Cabanier <cabanier@adobe.com>