Merge pull request #127 from czardoz/master

fixed #110
updated classifier to reflect model changes
removed m2crypto dependency. freedom \o/