fixed aes for faceting; adding facet legend
legend changes
Merge branch 'master' of github.com:yhat/ggplot