Refs #102

Adds unstaged chunks that should have gone
in the previous commit.
Merges uncommitted hunks.

Several hungs should have been included in the
previous commit, but weren't staged. Fixes #102.