Merge pull request #72 from Yelp/release-candidate

Release 0.3.0

NEW FEATURES

* Automatic merge conflict detection (rschlaikjer, #66)