pulling
Merge branch 'macSurvey' of https://github.com/shilad/macademia into macSurvey
pulling
Merge branch 'macSurvey' of https://github.com/shilad/macademia into macSurvey

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

Conflicts:
	Macademia/grails-app/views/d3/comparisonSurvey.gsp
sorry Marge I didn't do much, had to go.  cleaned up some stuff.  see line 285.  I think the makeButton function is the way to go