more assembler input compat
Merge branch 'master' of github.com:simonjhall/qpu_assembler

Conflicts:
	tokeniser.l