merge OFTN version #22

Merged

weskerfoot merged 4 commits from master into master 11 years ago

Author	SHA1	Message	Date
nisstyre56	a4d81a0bf7	remove code leftover from debugging	11 years ago
nisstyre56	c34fd71244	fix bug where defops were not being included by the tokenizer properly, fixed precedence order mixup in prelude.jl	11 years ago
nisstyre56	c29edfa7e1	remove extra parameter	11 years ago
nisstyre56	252798b134	return type alias bindings along with ast	11 years ago