named vars
Merge branch 'd3madness' of https://github.com/thuongvu/enerfeel into d3madness

Conflicts:
	public/js/directives.js