push for ken
pull from Rebecca
Merge branch 'visualizationHub' of https://github.com/shilad/macademia into visualizationHub
pull from jesse
Merge branch 'visualizationLayouts' of https://github.com/shilad/macademia into visualizationHub

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