add typejoin, and rename tintersect to typeintersect
make promote_type fall back to typejoin
fixes #1895, fixes #1183
Merge branch 'master' of github.com:JuliaLang/julia

Conflicts:
	base/deprecated.jl