Squashed commit of the following:

commit 3b133030800699c2106bfb30a104cd58710cf245
Author: Charles Lindsay <chaz@yorba.org>
Date:   Thu Jan 17 12:06:11 2013 -0800

    Clean up state on close; ref #6208

commit a4637a49277740b64ac198fa057eb52556c80efa
Author: Charles Lindsay <chaz@yorba.org>
Date:   Thu Jan 17 11:58:22 2013 -0800

    Simplify build_folder; ref #6208

commit e9afa248ce525f0496220cfbb0d8529e38cbceae
Author: Charles Lindsay <chaz@yorba.org>
Date:   Wed Jan 16 18:10:00 2013 -0800

    Cleanup; ref #6208

commit 95ee3a2c6fcfd4b9b7e10aae1100fe7a8697c25a
Author: Charles Lindsay <chaz@yorba.org>
Date:   Wed Jan 16 18:02:02 2013 -0800

    Aggregate building folders; ref #6208

commit 28ee5df718e08c0121b26b1934b619a409fb451a
Author: Charles Lindsay <chaz@yorba.org>
Date:   Wed Jan 16 16:49:17 2013 -0800

    Make local-only folders available; ref #6208

    This also slightly cleans up the special-casing of local-only folders.

commit 19c48fe657fca989fe0b519d39833dd8e0d95cfe
Author: Charles Lindsay <chaz@yorba.org>
Date:   Wed Jan 16 15:44:55 2013 -0800

    Use new interface; ref #6208

commit f64f82f9362a0081a3e4f7a21dc401f3d4ca320f
Author: Charles Lindsay <chaz@yorba.org>
Date:   Mon Jan 14 17:11:04 2013 -0800

    Try new interface in Account; ref #6208