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

Conflicts:
	Macademia/web-app/js/d3test/interest-viz.js
Merge branch 'visualizationLayouts' of https://github.com/shilad/macademia into visualizationLayouts
Merge branch 'visualizationLayouts' of https://github.com/shilad/macademia into visualizationLayouts

Conflicts:
	Macademia/web-app/js/d3test/interest-viz.js
Merge branch 'visualizationLayouts' of https://github.com/shilad/macademia into visualizationLayouts
Merge branch 'visualizationLayouts' of https://github.com/shilad/macademia into visualizationLayouts

Conflicts:
	Macademia/grails-app/views/d3/interest-viz.gsp
Merge branch 'visualizationLayouts' of https://github.com/shilad/macademia into visualizationLayouts

Conflicts:
	Macademia/grails-app/views/d3/interest-viz.gsp
Merge branch 'visualizationLayouts' of https://github.com/shilad/macademia into visualizationLayouts

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

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

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

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

Conflicts:
	Macademia/web-app/js/d3test/interest-viz.js
createClusterMap:trying to make a method to return our cluster map
Merge remote-tracking branch 'origin/visualizationLayouts' into visualizationLayouts

Conflicts:
	Macademia/grails-app/views/d3/interest-viz.gsp
createClusterMap:trying to make a method to return our cluster map
Merge branch 'visualizationLayouts' of https://github.com/shilad/macademia into visualizationLayouts

Conflicts:
	Macademia/grails-app/views/d3/interest-viz.gsp