Remove junk.
Cleanup.
Add updates.
Merge pull request #1 from bakercp/master

pulll request.