reverting most changes
Merge pull request #70 from cfinn2010/master

reverting most changes