commented out pickle stuff temporarily
more lines
more lines
Update windows installer setup files

Updated path to `installer.ps1` file to respect new toolset dir.

Updated `installer.ps1` to install the `Chocolatey` package manager,
install Scala, install latest JDK, and Play 2.2.
Added Windows support for `play-scala`
Updated play-scala setup for Windows

Updated the play-scala setup.py file to work with Windows (i.e. call
`play.bat`).

Fixed issues with the `stop()` method [Play2 no longer supports the
`stop` command].
new except block for subprocess and os error seem to be working
new except block for subprocess and os error seem to be working
Fixed merge conflicts
Fixed merge conflicts
Fixed merge conflict
Fixed merge conflict
Results of Linux i7 testing
Grizzly-bm pom.xml updated with newer version of source, previous was not available
Updated Grizzly-bm pom.xml with a new source version, previous version unavailable
Merge branch 'development' into grizzly-bm
Merge branch 'grizzly-bm' into development
finished off existing resumption code
Merge branch 'batchresumption_20130930' of ssh://gitlab.techempower.com:22898/techempower/frameworkbenchmarks into development
Merge branch 'development' of ssh://gitlab.techempower.com:22898/techempower/frameworkbenchmarks into development