Switched wording. Organized stuff.
nitpick
Merge pull request #1 from Jakehp/trunk

Switched wording. Organized stuff.