Merge branch 'master' into horizon

Conflicts:
	build/phase0/pyret.js
	docs/written/trove/srcloc.js.rkt
	src/arr/compiler/compile-lib.arr
	src/arr/compiler/compile-structs.arr
	src/arr/compiler/locators/builtin.arr
	src/arr/compiler/locators/legacy-path.arr
	src/arr/trove/graph.arr
	src/js/trove/world.js
	tests/pyret/tests/test-builtin-locator.arr
	tools/benchmark/README.md

Makefile

@@ -345,8 +345,8 @@ $(RELEASE_DIR)/phase1:
 	$(call MKDIR,$(RELEASE_DIR)/phase1)
 
 ifdef VERSION
-release-gzip: $(PYRET_COMP) phase1 $(RELEASE_DIR)/phase1
-	gzip -c $(PYRET_COMP) > $(RELEASE_DIR)/pyret.js
+release-gzip: $(PYRET_COMP) phase1 standalone1 $(RELEASE_DIR)/phase1
+	gzip -c $(PHASE1)/pyret.js > $(RELEASE_DIR)/pyret.js
 	(cd $(PHASE1) && find * -type d -print0) | parallel --gnu -0 mkdir -p '$(RELEASE_DIR)/phase1/{}'
 	(cd $(PHASE1) && find * -type f -print0) | parallel --gnu -0 "gzip -c '$(PHASE1)/{}' > '$(RELEASE_DIR)/phase1/{}'"
 horizon-gzip: standalone1 $(RELEASE_DIR)/phase1

README.md

@@ -1,7 +1,7 @@
 
 ![Yarr](https://raw.github.com/brownplt/pyret-lang/master/img/pyret-banner.png)
 
-[![Build Status](https://travis-ci.org/brownplt/pyret-lang.png)](https://travis-ci.org/brownplt/pyret-lang)
+[![Build Status](https://travis-ci.org/brownplt/pyret-lang.svg)](https://travis-ci.org/brownplt/pyret-lang)
 
 A scripting language.