front end working, trying to add d3 viz, but need to figure either url_conf or json
Merge branch 'master' into working_copy