matt changes
Merge branch 'master' into matt

Conflicts:
	docs/meeting/outline.txt
update