sundry mods
Merge branch 'master' of github.com:blippy/ssa

Conflicts:
	data.c