Cleaned up code extensively, still need comments on lots of lines. All
obsolete code is gone.
Merge pull request #9 from texastony/masterTony427

Cleaned up code extensively, still need comments on lots of lines. All