Fixed failing build
Fixed broken build
Merge branch 'merge-broken-build' into develop
Revert "Changed app structure to match John Papa style guide and added InsightJS as a dependency"

This reverts commit 612a803bfc33e84e3956bcf3b2b7bb83b958af5d.

Conflicts:
	app/app.module.js
	app/app.routes.js
	app/chartCanvas/main.html
	app/chartCanvas/main.js
	app/charts/main.controller.js
	app/charts/main.html
	app/index.html
	app/scripts/controllers/main.js
	app/views/main.html
	test/spec/controllers/about.js
	test/spec/controllers/main.js
Removed merge conflicts and and removed obsolete folder
Fixed broken build
Changed main module name to insightExplorer
Updated Gruntfile to watch all.js files and run tests
Added test-watch task to grunt
Merge pull request #2 from tylerferguson/develop

Fixed Broken Build