trying to pull
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/web-app/js/d3test/person-layout.js
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/web-app/js/d3test/person-layout.js
added "type":person and "type":interest to the people and interests
added "type":person and "type":interest to the people and interests