This should be the last commit on this branch for a while. I'm going to use branches to develop new features and bugfixes. Commits on this branch should primarily be merge commits. Hopefully, this is the start of a long successful project.
BUGFIX: A few new doc strings were indented wrong.
Merge branch 'dev-0.2.2'

Conflicts:
	word_agent.py
Merge branch 'develop'

More experimentation with the merge functionality.
Dockerized!
More tweaking for Dockerfile
Merge branch 'master' into develop

Conflicts:
	wa_gtk.py