revert to alignment and reformatting changes
Merge branch 'kaley'

Conflicts:
	422Disassembler.X68