Merge pull request #66 from cglewis/graphlab_cleanup

Graphlab cleanup
fix bug
Merge pull request #67 from cglewis/graphlab_cleanup

fix bug
Merge branch 'pr-parsefaunusgraphson'
Merge pull request #69 from kylef-lab41/pr-parsefaunusgraphson

Add ability to parse Faunus GraphSON format
Merge branch 'master' of https://github.com/Lab41/Dendrite
Merge branch 'kylef:pr-cleanupjs'

Conflicts:
	src/main/webapp/js/controllers.js