Removed some commented out code
Merge branch 'master' of https://github.com/aaronjrich/pickles