getting rid of this computer and uploading all files
Merge branch 'master' of https://github.com/specialorange/PD

* 'master' of https://github.com/specialorange/PD:
  cleaning up
  ready for initial showing to Troy
  just before taking to apple
  just before taking to apple

Conflicts:
	cfd/www/css/visualizations/occurrence.css
	cfd/www/js/visualizations/occurrence.js
	cfd/www/js/visualizations/occurrence.js.old
	css/occurence.css
	css/occurrence.css
	docs/DL/meta categories
	js/occurence.js
	js/occurence.js.old
	js/occurrence.js
	js/occurrence.js.old