testing gh-pages auto update
test
Merge branch 'master' of https://github.com/drc/insight

Conflicts:
	app/layouts/service.js
test
test
test
Merge branch 'master' of https://github.com/drc/insight

Conflicts:
	app/layouts/service.js
made suer everything fit within 80 cols
lots of refactoring with mock data