Warn and exit if both -j and -k are passed as these are exclusive options

This is in response #93, but I have seen this mistake else where as well.
Increment version to 0.84 for release
Increment version to 0.85.0 to development version
Merge branch 'master' of https://github.com/openstreetmap/osm2pgsql