ready for initial showing to Troy
Merge branch 'master' of https://github.com/specialorange/PD

* 'master' of https://github.com/specialorange/PD:
  just before taking to apple
  just before taking to apple
  first round of classifications complete
  adding reference docs
  added occurences

Conflicts:
	cfd/www/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg
	cfd/www/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf
	cfd/www/bower_components/d3/LICENSE
	cfd/www/css/visualizations/2metric.css
	cfd/www/css/visualizations/barnegative.css
	cfd/www/css/visualizations/bootstrap-theme.css
	cfd/www/css/visualizations/bootstrap-theme.css.map
	cfd/www/css/visualizations/bootstrap-theme.min.css
	cfd/www/css/visualizations/bootstrap.css
	cfd/www/css/visualizations/bootstrap.css.map
	cfd/www/css/visualizations/bootstrap.min.css
	cfd/www/css/visualizations/boxplot.css
	cfd/www/css/visualizations/bubble.css
	cfd/www/css/visualizations/calendar.css
	cfd/www/css/visualizations/crossfilter.css
	cfd/www/css/visualizations/difference.css
	cfd/www/css/visualizations/dualbar.css
	cfd/www/css/visualizations/info.css
	cfd/www/css/visualizations/normalizedstacked.css
	cfd/www/css/visualizations/scatterplot.css
	cfd/www/css/visualizations/scatterplottime.css
	cfd/www/css/visualizations/sortablebar.css
	cfd/www/css/visualizations/stackedarea.css
	cfd/www/css/visualizations/stackedgroup.css
	cfd/www/css/visualizations/sunburst.css
	cfd/www/css/visualizations/transitions.css
	cfd/www/data/2metric.json
	cfd/www/data/barnegative.tsv
	cfd/www/data/boxplot.csv
	cfd/www/data/bubble.json
	cfd/www/data/calendar.csv
	cfd/www/data/crossfilter.json
	cfd/www/data/difference.tsv
	cfd/www/data/dualbar.tsv
	cfd/www/data/normalizedstacked.csv
	cfd/www/data/scatterplot.tsv
	cfd/www/data/scatterplottime.json
	cfd/www/data/sortablebar.tsv
	cfd/www/data/stackedarea.tsv
	cfd/www/data/sunburst.csv
	cfd/www/data/transitions.csv
	cfd/www/img/2-metric-time.png
	cfd/www/img/barnegative.png
	cfd/www/img/boxplot.png
	cfd/www/img/bubble.png
	cfd/www/img/calendar.png
	cfd/www/img/crossfilter.png
	cfd/www/img/difference.png
	cfd/www/img/dualbar.png
	cfd/www/img/info.png
	cfd/www/img/normalizedstacked.png
	cfd/www/img/pd.jpg
	cfd/www/img/scatterplot.png
	cfd/www/img/scatterplottime.png
	cfd/www/img/sortablebar.png
	cfd/www/img/stackedarea.png
	cfd/www/img/stackedgroup.png
	cfd/www/img/sunburst.png
	cfd/www/img/transitions.png
	cfd/www/js/visualizations/2metric.js
	cfd/www/js/visualizations/barnegative.js
	cfd/www/js/visualizations/bootstrap.js
	cfd/www/js/visualizations/bootstrap.min.js
	cfd/www/js/visualizations/box.js
	cfd/www/js/visualizations/boxplot.js
	cfd/www/js/visualizations/bubble.js
	cfd/www/js/visualizations/crossfilter.v1.min.js
	cfd/www/js/visualizations/crossfiltermain.js
	cfd/www/js/visualizations/d3.v3.js
	cfd/www/js/visualizations/d3.v3.min.js
	cfd/www/js/visualizations/difference.js
	cfd/www/js/visualizations/dualbar.js
	cfd/www/js/visualizations/info.js
	cfd/www/js/visualizations/jquery.isotope.min.js
	cfd/www/js/visualizations/jquery.min.js
	cfd/www/js/visualizations/normalizedstacked.js
	cfd/www/js/visualizations/pd.js
	cfd/www/js/visualizations/scatterplot.js
	cfd/www/js/visualizations/scatterplottime.js
	cfd/www/js/visualizations/sortablebar.js
	cfd/www/js/visualizations/stackedarea.js
	cfd/www/js/visualizations/stackedgroup.js
	cfd/www/js/visualizations/sunburst.js
	cfd/www/js/visualizations/transitions.js
	cfd/www/partials/visualizations/2metric.html
	cfd/www/partials/visualizations/barnegative.html
	cfd/www/partials/visualizations/boxplot.html
	cfd/www/partials/visualizations/bubble.html
	cfd/www/partials/visualizations/calendar.html
	cfd/www/partials/visualizations/crossfilter.html
	cfd/www/partials/visualizations/difference.html
	cfd/www/partials/visualizations/dualbar.html
	cfd/www/partials/visualizations/info.html
	cfd/www/partials/visualizations/normalizedstacked.html
	cfd/www/partials/visualizations/scatterplot.html
	cfd/www/partials/visualizations/scatterplottime.html
	cfd/www/partials/visualizations/sortablebar.html
	cfd/www/partials/visualizations/stackedarea.html
	cfd/www/partials/visualizations/sunburst.html
	cfd/www/partials/visualizations/transitions.html
	data/occurence.json
	docs/DL/meta categories
	pd.sublime-workspace