Upgrading to Scala 2.11
Merge pull request #155 from NetLogo/scala-2.11

Upgrading to Scala 2.11
upgrade to sbt 0.13.6

no special reason, just keeping current
upgrade to Play 2.3.4

no special reason, just keeping current
Merge pull request #156 from NetLogo/version-upgrades

misc version upgrades
Cleaning up erroneous script inclusions
Upgrading dependencies
Updating to latest Tortoise version
Killing off some dead code

But can you really kill what's already dead?
Throwing out troublesome and unused Bootstrap dep.
Merge remote-tracking branch 'origin/master' into wip-issue-150-api

Conflicts:
	app/controllers/CompilerService.scala
	build.sbt
Clarify expected results in a CompilerService test