word smithing.
more updates
Merge pull request #5 from scopatz/master

This is my final pass