Fixed up packaging done by bmetin
Merge remote-tracking branch 'github/master' into yelp
update changelog
Merge pull request #5 from baris/master

Merge fixes for packaging.