Comment out unused features (for now), update test suite
Remove pry statement
Style updates
Merge pull request #178 from rickcarlino/master

Comment out unused features (for now), update test suite