Cleaned up and trimmed down some language
Merge pull request #31 from ndhoule/master

Language cleanup. Will remove diff headers the lazy way through the github interface.