more ggplot2 deprecated changes
Merge branch 'master' into ICare