Merge branch 'master' into gh-pages
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch gh-pages
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   .gitignore
#	new file:   .jshintrc
#	modified:   Gruntfile.js
#	modified:   README.md
#	modified:   bower.json
#	modified:   demo/index.html
#	modified:   package.json
#	new file:   spec/asts/directed/clust4.js
#	new file:   spec/data-helper.js
#	new file:   spec/dot-parser-directed-spec.js
#	new file:   spec/dots/directed.js
#	new file:   spec/dots/directed/KW91.gv
#	new file:   spec/dots/directed/Latin1.gv
#	new file:   spec/dots/directed/NaN.gv
#	new file:   spec/dots/directed/abstract.gv
#	new file:   spec/dots/directed/alf.gv
#	new file:   spec/dots/directed/arr_none.gv
#	new file:   spec/dots/directed/arrows.gv
#	new file:   spec/dots/directed/awilliams.gv
#	new file:   spec/dots/directed/biological.gv
#	new file:   spec/dots/directed/clust.gv
#	new file:   spec/dots/directed/clust1.gv
#	new file:   spec/dots/directed/clust2.gv
#	new file:   spec/dots/directed/clust3.gv
#	new file:   spec/dots/directed/clust4.gv
#	new file:   spec/dots/directed/clust5.gv
#	new file:   spec/dots/directed/crazy.gv
#	new file:   spec/dots/directed/ctext.gv
#	new file:   spec/dots/directed/dfa.gv
#	new file:   spec/dots/directed/fig6.gv
#	new file:   spec/dots/directed/fsm.gv
#	new file:   spec/dots/directed/grammar.gv
#	new file:   spec/dots/directed/hashtable.gv
#	new file:   spec/dots/directed/honda-tokoro.gv
#	new file:   spec/dots/directed/japanese.gv
#	new file:   spec/dots/directed/jcctree.gv
#	new file:   spec/dots/directed/jsort.gv
#	new file:   spec/dots/directed/ldbxtried.gv
#	new file:   spec/dots/directed/longflat.gv
#	new file:   spec/dots/directed/mike.gv
#	new file:   spec/dots/directed/nhg.gv
#	new file:   spec/dots/directed/oldarrows.gv
#	new file:   spec/dots/directed/pgram.gv
#	new file:   spec/dots/directed/pm2way.gv
#	new file:   spec/dots/directed/pmpipe.gv
#	new file:   spec/dots/directed/polypoly.gv
#	new file:   spec/dots/directed/proc3d.gv
#	new file:   spec/dots/directed/psfonttest.gv
#	new file:   spec/dots/directed/record2.gv
#	new file:   spec/dots/directed/records.gv
#	new file:   spec/dots/directed/rowe.gv
#	new file:   spec/dots/directed/russian.gv
#	new file:   spec/dots/directed/sdh.gv
#	new file:   spec/dots/directed/shells.gv
#	new file:   spec/dots/directed/states.gv
#	new file:   spec/dots/directed/structs.gv
#	new file:   spec/dots/directed/switch.gv
#	new file:   spec/dots/directed/table.gv
#	new file:   spec/dots/directed/train11.gv
#	new file:   spec/dots/directed/trapeziumlr.gv
#	new file:   spec/dots/directed/tree.gv
#	new file:   spec/dots/directed/triedds.gv
#	new file:   spec/dots/directed/try.gv
#	new file:   spec/dots/directed/unix.gv
#	new file:   spec/dots/directed/unix2.gv
#	new file:   spec/dots/directed/viewfile.gv
#	new file:   spec/dots/directed/world.gv
#	new file:   spec/dots/undirected/ER.gv
#	new file:   spec/dots/undirected/Heawood.gv
#	new file:   spec/dots/undirected/Makefile.am
#	new file:   spec/dots/undirected/Petersen.gv
#	new file:   spec/dots/undirected/ngk10_4.gv
#	new file:   spec/dots/undirected/process.gv
#	new file:   spec/xdot-parser-directed-spec.js
#	new file:   spec/xdots/directed.js
#	new file:   spec/xdots/directed/KW91.xdot
#	new file:   spec/xdots/directed/Latin1.xdot
#	new file:   spec/xdots/directed/NaN.xdot
#	new file:   spec/xdots/directed/abstract.xdot
#	new file:   spec/xdots/directed/alf.xdot
#	new file:   spec/xdots/directed/arr_none.xdot
#	new file:   spec/xdots/directed/arrows.xdot
#	new file:   spec/xdots/directed/awilliams.xdot
#	new file:   spec/xdots/directed/biological.xdot
#	new file:   spec/xdots/directed/clust.xdot
#	new file:   spec/xdots/directed/clust1.xdot
#	new file:   spec/xdots/directed/clust2.xdot
#	new file:   spec/xdots/directed/clust3.xdot
#	new file:   spec/xdots/directed/clust4.xdot
#	new file:   spec/xdots/directed/clust5.xdot
#	new file:   spec/xdots/directed/crazy.xdot
#	new file:   spec/xdots/directed/ctext.xdot
#	new file:   spec/xdots/directed/dfa.xdot
#	new file:   spec/xdots/directed/fig6.xdot
#	new file:   spec/xdots/directed/fsm.xdot
#	new file:   spec/xdots/directed/grammar.xdot
#	new file:   spec/xdots/directed/hashtable.xdot
#	new file:   spec/xdots/directed/honda-tokoro.xdot
#	new file:   spec/xdots/directed/japanese.xdot
#	new file:   spec/xdots/directed/jcctree.xdot
#	new file:   spec/xdots/directed/jsort.xdot
#	new file:   spec/xdots/directed/ldbxtried.xdot
#	new file:   spec/xdots/directed/longflat.xdot
#	new file:   spec/xdots/directed/mike.xdot
#	new file:   spec/xdots/directed/nhg.xdot
#	new file:   spec/xdots/directed/oldarrows.xdot
#	new file:   spec/xdots/directed/pgram.xdot
#	new file:   spec/xdots/directed/pm2way.xdot
#	new file:   spec/xdots/directed/pmpipe.xdot
#	new file:   spec/xdots/directed/polypoly.xdot
#	new file:   spec/xdots/directed/proc3d.xdot
#	new file:   spec/xdots/directed/psfonttest.xdot
#	new file:   spec/xdots/directed/record2.xdot
#	new file:   spec/xdots/directed/records.xdot
#	new file:   spec/xdots/directed/rowe.xdot
#	new file:   spec/xdots/directed/russian.xdot
#	new file:   spec/xdots/directed/sdh.xdot
#	new file:   spec/xdots/directed/shells.xdot
#	new file:   spec/xdots/directed/states.xdot
#	new file:   spec/xdots/directed/structs.xdot
#	new file:   spec/xdots/directed/switch.xdot
#	new file:   spec/xdots/directed/table.xdot
#	new file:   spec/xdots/directed/train11.xdot
#	new file:   spec/xdots/directed/trapeziumlr.xdot
#	new file:   spec/xdots/directed/tree.xdot
#	new file:   spec/xdots/directed/triedds.xdot
#	new file:   spec/xdots/directed/try.xdot
#	new file:   spec/xdots/directed/unix.xdot
#	new file:   spec/xdots/directed/unix2.xdot
#	new file:   spec/xdots/directed/viewfile.xdot
#	new file:   spec/xdots/directed/world.xdot
#	modified:   src/grammar/dot.pegjs
#	modified:   src/grammar/xdot.pegjs
#	new file:   src/pegace.js
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   index.html
#	modified:   target/parser/dot.js
#	modified:   target/parser/xdot.js
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	lib/ace/mode/_test/package.json
#	lib/requirejs-text/
#	lib/requirejs/.bower.json
#	lib/requirejs/.gitignore
#	lib/requirejs/LICENSE
#	lib/requirejs/README.md
#	lib/requirejs/dist/
#	lib/requirejs/docs/
#	lib/requirejs/index.html
#	lib/requirejs/package.json
#	lib/requirejs/tasks.txt
#	lib/requirejs/testBaseUrl.js
#	lib/requirejs/tests/
#	lib/requirejs/updatesubs.sh
#	target/pegace.js