wagn/wagn — pull request #66 by GerryG (2013-01-18 23:13:32+00:00)
Title: Moving some re-org changes upstream

I think this is all of is, but I want to look for more easy changes.

Let me know if you see any other changes I should pull into this one.