Squashed commit of the following:

commit 90d9d966e4259fec03f4725d85803c5eb8bc9f5c
Author: Charles Johnson <charles@opscode.com>
Date:   Thu Oct 24 15:10:42 2013 -0700

    Rebased onto current. Fixed a couple of small style issues with recipe & test.

commit 5b18a449733bde06e290e02da69c6bd81efc596d
Author: Scott Lampert <scott@lampert.org>
Date:   Tue Oct 1 18:56:15 2013 -0600

    Implement requested changes.

    * Moved attribute documentation to relevant part of README.md
    * Added two more chefspec tests
    * Fixed a reversion caught by the new chefspec tests.

commit 2a30487fc12759bcc5465a7dbfdcc152489322d0
Author: Scott Lampert <scott@lampert.org>
Date:   Tue Oct 1 11:30:55 2013 -0600

    Fixups for Travis

commit a5a9f214292b17dac986de969ddfd9e1e1040737
Author: Scott Lampert <scott@lampert.org>
Date:   Tue Sep 17 15:57:39 2013 -0600

    Fix documentation of new behavior

commit 42664c1f40855cbe4604fd3b9c648a1daef7ad34
Author: Scott Lampert <scott@lampert.org>
Date:   Tue Sep 17 15:56:30 2013 -0600

    Requested fixes

commit a86510f9c88efc2ee545d71bde6eaeaf74db6708
Author: Scott Lampert <scott@lampert.org>
Date:   Thu Sep 12 19:16:56 2013 -0600

    Fix spec test for apparmor recipe

commit 26325d57bf88aa1c6a3d6a9b140f1359622b2501
Author: Scott Lampert <scott@lampert.org>
Date:   Thu Sep 12 18:25:26 2013 -0600

    Set apparmor to restart on notify

commit 300b49158c9f108156c71bc14780aa3bad53a6c0
Author: Scott Lampert <scott@lampert.org>
Date:   Thu Sep 12 16:26:10 2013 -0600

    Add fix for ntp.leapseconds apparmor error
    Fixes [COOK-3023]