Reorganize paper

Also change semantics to properly use sets of values/PMSMs
Merge branch 'master' of github.com:ianj/temporal-aam

Conflicts:
	cpcf.tex