CLN: change call signature of _maybe_promote (from stephenwlin branch)
     and _infer_dtype_from_scalar to match (both return dtype, fill_value)

Diff between 'jreback/dtypes_bug' and 'stephenwlin/dtypes_bug'

Conflicts:

	pandas/core/common.py