Replace deprecated methods, clean up
Merge pull request #3 from garborg/master

Replace deprecated methods, clean up