Trying to resolve #18 again.

Only committing files I actually changed rather than letting git do all
the work.