include edge cairo in travis
need automake
remove makefiles
maybe autoconf
add in autoreconf step
Merge branch 'master' into gh-pages