Various updates from test computer.
Merge branch 'master' of https://github.com/aronglennon/automatic_programming_sound_synthesis

Conflicts:
	text/Dissertation.tex