fix how caching is disabled on our static content by adding the parameters to a servlet holder instead of the servelet handler
fix Issue #214 by providing address to bind to ServerSocket
unlink other bugfix
unlink other bugfix
Merge pull request #321 from twosigma/bugfix

fix how caching is disabled on our static content by adding the paramete...
Merge pull request #322 from twosigma/bugfix2

fix Issue #214 (multiple instances on mac)
Fix #323, add option to suppress message logging for some private use cases of readFile
Merge pull request #324 from twosigma/alee-fix-323

Fix #323, add option to suppress message logging for some private use ca...
fixes for windows: 1) move block of temp directory specs for nginx above the server block, will prob be required for new version of nginx 1.7 on all platforms.  2) add an = to the location spec for the root-level redirect to prevent race condition resulting in infinite loop of redirects.  3) add some mysterious sleep cmds to avoid a race condition or something. 4) skip the posix file permissions as they do not exist on windows.  this means if other people can log onto your windows box then it is insecure for beaker.  4) add python to where we fork scripts since windows does not handle the #! construct.  5) quote backslashes in path to R password file since R chokes otherwise.
Merge branch 'master' of https://github.com/twosigma/beaker-notebook into windows-fixes
tab to spaces
more whitespace fixes, rename windows to isWindows
Merge pull request #325 from twosigma/windows-fixes

Windows fixes
Add top-level gradle build file that just redirects to our existing build system.  This addresses part of Issue #316, enough to get working with Travis.  Also add a .travis.yml file that should get us building there.
add assemble build target, used by travis
Merge pull request #330 from twosigma/travis

Travis
Update README.md
add a bug to test travis
Merge pull request #331 from twosigma/travis

add a bug to test travis
removing bug -- test complete