Working Copy

Needs organization into OOD code.  Need to look into errors about
unexpected data.
Merge remote-tracking branch 'origin/master'

Conflicts:
	symbolmap.py