now we can just run 'grunt dev' to get browserify, the test server and the watch all running
now selenium server start automatically
added globals for mocha and set warning to display for missing semi-colons
Updated testing set up
added more features to test, incl/ citations
updated tests
minor tweaks. using /test/ again
add /test/ back in
add note about ImageMagick for tests
put jshint test back in
minor updates
add semicolons, give up bc there need to be too many, change asi back to true for now, update location of last known good o
ne-of-each png image
Add lightweight grunt dev task
Working on integrating gpml to json, not yet functional
it's working with new gpml2json code, although the edges are not perfect yet
Merge branch 'diff' into newjson

Conflicts:
	src/js/pathvisiojs.js
Use unminified version of pathvisiojs in demo
Adjust highlighter to newjson
Adjust diff viewer to newjson
Change colors to new color scheme