Merge pull request #378 from MDCox/programmaticStyles

Programmatic Edge Styling
styles refactor (broken commit)
Merge branch 'release-0.3' into initMethods

Conflicts:
	app/scripts/alchemy/core/updateGraph.coffee
	app/scripts/alchemy/models/edge.coffee
Merge pull request #379 from hustonhedinger/initMethods

Init methods
Node styling rehooked up
Edge styles rehooked
Edge captions shown