Properly detect the default release and fail on conflicts

Closes #93
Merge pull request #95 from josevalim/jv-default-release

Properly detect the default release and fail on conflicts