Fixes for the great type rename

Merge pull request #275 from JuliaGraphics/yyc/0.6

Fix 0.6 abstract type declaration depwarn

Fixes for Julia 0.6 and promotion improvements

Merge pull request #274 from JuliaGraphics/yyc/0.6

Fix 0.6 depwarns in src/