tweaking how matrix is calcuated
Merge branch 'master' of github.com:michalgm/CalEP_vis
working on districts view
Merge branch 'master' of github.com:michalgm/CalEP_vis

Conflicts:
	app/scripts/main.js
fix accidental conflict commit
cleaning up tooltips
fixing districts view
auto-reload
auto-size label length
fade when hovering on chord