Indent this, because otherwise it's going to drive me crazy
Remove ScalaJS stuff from master; will have to merge into the scalajs branch manually the first time