Create error for upgrading to same version.
Add --diff option to rose-date.
Attempt to look into #1315
Fix a bug where the variable isn't defined, and document this change
Merge pull request #1306 from arjclark/fix.upgrade_same_version_msg

rose app-upgrade: better error message for upgrade to same version
Tweak if ordering following review.
Add test for offsetting.
Merge pull request #1316 from arjclark/rose_date_diff

rose date: add --diff option
rose metadata: improve pattern documenation
rose edit: do not hardcode combo grid width
Merge pull request #1319 from benfitzpatrick/adjust-combo-width

rose edit: do not hardcode combo grid width
#1176: check id usage in fail-if, warn-if
#1176: update rule macro test config
Merge pull request #1318 from benfitzpatrick/more-doc-pattern-metadata

rose metadata: improve pattern documenation
#1176: update vs comments
Update to use automatic-options
Merge pull request #1317 from scwhitehouse/rose-stem-site

Allow rose-stem to read a variable from the rose.conf file
Add example rose.conf file for #1317
Moved up file
Merge pull request #1324 from scwhitehouse/rose-stem-autoopt-roseconfexample

Add example rose.conf file for #1317