merge v1

Summary: merging v1 into master

Test Plan: make test

Reviewers: diana, josh

Differential Revision: https://50.18.170.14/D4985

.gitattributes

@@ -1,3 +1,3 @@
-build/grapher.js binary
-build/grapher-min.js binary
+build/* binary
 doc/**/* binary
+

LICENSE

@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2014 Ayasdi, Inc.
+   Copyright 2015 Ayasdi, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -7,7 +7,7 @@ else
 	isbranch = no
 endif
 
-all: grapher.js doc
+all: grapher.js grapher-min.js doc
 
 test: grapher.js
 	@grunt jasmine
@@ -16,9 +16,12 @@ doc: grapher.js
 	@groc
 
 grapher.js:
-	@npm run build
+	@npm run grapher.js
 
-gh-pages: grapher.js doc
+grapher-min.js: grapher.js
+	@npm run grapher-min.js
+
+gh-pages: grapher.js grapher-min.js doc
 
 # create a temporary branch and commit any changes
 	@git checkout -b temp-$(commit)

README.md

@@ -1,20 +1,36 @@
-Ayasdi.Grapher
+Grapher
 ==============
 
-WebGL/Canvas Network Graphing using PIXI.js.
-
+Draw network graphs using WebGL and Canvas backup.
 
 Download
 --------
-Grapher comes bundled with PIXI.js.
 
-* [bundled](http://ayasdi.github.io/grapher/build/grapher.js)
-* [bundled-min](http://ayasdi.github.io/grapher/build/grapher-min.js)
+* [grapher](http://ayasdi.github.io/grapher/build/grapher.js)
+* [grapher-min](http://ayasdi.github.io/grapher/build/grapher-min.js)
+
+Installing
+----------
+
+You can import grapher in a script tag, or build grapher into your application
+using [Duo](http://duojs.org/):
+
+    var Grapher = require('ayasdi/grapher');
+
+Additional Modules
+------------------
 
-An unbundled version can be found in the modules folder.
-This version is useful if you are already using some of the dependencies or
-are using a package management system.
+Need a specific feature? Create your own modules for Grapher!
+Here are some modules we've made:
 
+* [center](https://github.com/ayasdi/grapher-center):
+    Helpful functions for centering the graph.
+* [palette](https://github.com/ayasdi/grapher-palette):
+    Set up custom palettes and set colors by palette indices.
+* [target](https://github.com/ayasdi/grapher-target):
+    Target a node or link, or find the nearest nodes and links.
+* [zoom](https://github.com/ayasdi/grapher-zoom):
+    Zoom adjusts Grapher's scale by ratio. Optionally target a point as the zoom center.
 
 Examples
 --------