Fix to always use the Java version specified in JAVA_HOME
Merge pull request #643 from typesafehub/wip/h3nk3-bat-script-fix

Fix to always use the Java version specified in JAVA_HOME
Upgraded Elucidator to lastest version which uses a Scala 2.11 version of Spray.
Merge pull request #650 from typesafehub/wip/h3nk3-elucidator-version

Upgraded Elucidator to lastest version which uses a Scala 2.11 version o...
remove dup
Travis: scala 2.10.4, increase Xmx, decrease Xms

Trying to avoid out-of-memory errors.
Merge pull request #675 from typesafehub/wip/havocp-travis-changes

Travis: scala 2.10.4, increase Xmx, decrease Xms
Revert "Travis: scala 2.10.4, increase Xmx, decrease Xms"
Merge pull request #676 from typesafehub/revert-675-wip/havocp-travis-changes

Revert "Travis: scala 2.10.4, increase Xmx, decrease Xms"
Merge pull request #673 from boostrack/patch-1

remove dup
Travis: Add a bunch of GC options to SBT_OPTS
add SBT_OPTS to each env instead of making a new one
Try using -J method of providing jvm opts in travis.yml
Merge pull request #678 from typesafehub/wip/havocp-fix-travis

Travis: Add a bunch of GC options to SBT_OPTS
Merge remote-tracking branch 'origin/master' into wip/sbt-server

Conflicts:
	project/Dependencies.scala
Upgrade to sbt-rc version that supports Play 2.3.3

Conflicts:
	project/Dependencies.scala
Upgraded to latest template hash.

Conflicts:
	project/LocalTemplateRepo.scala
Fix offlineTests

 * update to latest cache hash
 * jump jshint to 1.0.1
Merge branch 'wip/havocp-from-1.2.x' into wip/sbt-server
(This is merging in master basically.)

Conflicts:
	project/Dependencies.scala
Travis: Don't run offlineTests as part of integrationTests also

Because integrationTests pulled in offlineTests, the overall build
took too long.