changed words to symbols for avalon master
cleanup merge
more cleanum. Note to self: never add autogenerated files to gitgit add -A