commit for pull
Merge branch 'interactiveVisualization' of https://github.com/shilad/macademia into interactiveVisualization

Conflicts:
	Macademia/web-app/js/d3test/interest-viz.js