Fix doc typo ("contiuous").
fixes #837: remove the movies object so that geom_violin() examples work after geom_histogram()
Added defaults to the reparameterise function of dotplot so that it still works when no params are passed in (as when using qplot).
More about pull requests
More on development
More encouragement
Avoid merge conflicts in NEWS file

by using the `union` merge strategy.

See also http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/.
Re-roxygenise
Tweaking checklist
add test
when testing if an identifier refers to a calculated aesthetic, check the whole identifier, not a substring

also, define the regex that is used for matching only once, in a hidden global variable

fixes #834

Conflicts:
	R/layer.r

Resolved by combining.
First attempt at staticdocs auto-deploy
add "none" to documentation of theme() for parameter legend.position

Fixes #829
update Rd file
update NEWS
remove unnecessary namespace prefix from the tests
Add mgcv to suggests
Only run staticdocs if deploying
Themes vignette from Dennis Murphy
Update themes vignette style