Fix some compile errors, untested
Merge branch 'sync.cl-mtgnet.master' of https://github.com/mtstickney/sync into sync.cl-mtgnet.master

Conflicts:
	marshall.lisp