Some cleanup of code to prepare for merging
Merge pull request #25 from grahamcracker/pr/24

Minor Mods of Forums Branch