Merge pull request #1 from hartsick/tj

foist commit
Merge pull request #2 from hartsick/christa

Christa
causing a conflict
Merge pull request #3 from hartsick/tj

causing a conflict
yeah
Merge pull request #4 from hartsick/tj

yeah
mike
Merge pull request #6 from hartsick/tj

mike
fixing merge