Roxygen changed stuff. Hopefully merges.
Merge branch 'master' of https://github.com/eriqande/lowergranite