added "type":person and "type":interest to the people and interests
hope this pull works out
hope this pull works out
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
it's broken
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/application.properties
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/application.properties
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/application.properties
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/application.properties
trying to get intelliJ to highlight stuff
trying to get intelliJ to highlight stuff
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/views/d3/base-viz.gsp
	Macademia/web-app/js/d3test/base-viz.js
Merge branch 'consortia' of https://github.com/shilad/macademia into consortia

Conflicts:
	Macademia/grails-app/views/d3/base-viz.gsp
	Macademia/web-app/js/d3test/base-viz.js
cloneInterests: we don't like your kind