don't allow people to send us nonsense numbers to mess up the lines of code counter
Smarter about when we timeout for some playlab levels
Merge pull request #642 from code-dot-org/playlabTimeout

Smarter about when we timeout for some playlab levels
clip at 1000 instead of setting to 0
Merge pull request #641 from code-dot-org/nonsense-lines

don't allow people to send us nonsense numbers to mess up the lines of code counter
Automatically built.

commit d6b72446030a8e7e5ed48abb3e1c28fc4a171e5f
Merge: dd32826 e002a8b
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Dec 3 12:14:22 2014 -0800

    Merge pull request #642 from code-dot-org/playlabTimeout

    Smarter about when we timeout for some playlab levels

commit e002a8b7e7661bbbfe3f33994e82d102cd92f297
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Wed Dec 3 11:22:44 2014 -0800

    Smarter about when we timeout for some playlab levels
Persist block html ID
Chef cookbook changes for stand-alone levelbuilder, and buidl system changes as well.
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging