Towards the dead end
Merge branch 'master' of github.com:flammie/purplemonkeydishwasher

Conflicts:
	diss/Pirinen-2012-dissertation.tex
Roughly first set of feedback.

Lot of hacks to citations and shortened headings
Things and snuff