Readd scatter plot as directive
Readd barchart directive
Delete migrated MOS js files
Merge branch 'develop' of github.com:azavea/mos-energy-benchmark into develop

Conflicts:
	app/index.html
	bower.json