Fixing up the last several files.
Merge pull request #2 from kmarsteller/master

Last few files