New travis branch

This is a rebase and update for https://github.com/yhat/ggplot/pull/81