Merge pull request #1 from hadley/master

merge master back in
fix for syntax error in labeller examples
fix for missing data exchange in examples

without exchanging the data in p2 with the updated msleep data frame,
the facet_grid won't recognize the conservation2 variable
Merge pull request #949 from sebkopf/skdev

small syntax error fix in labeller examples