Merge branch 'master' into gh-pages
Combine diffsource, source and confsource; default to '.'
Logic fix for --cycle with a cycle time specified.
Sort all but one of Matt's comments
Merge branch 'upstream/master' into simplify-stem
Added comment and tweak to logic.
Use fcm loc-layout to grab the revision number (if any)
Merge pull request #502 from scwhitehouse/simplify-stem

rose stem: combine diffsource, source and confsource; default to '.'
Merge pull request #504 from arjclark/rose-task-env-cycle-bug

rose task-env: fix for --cycle with a cycle time specified.
Merge branch 'gh-pages' of github.com:metomi/rose into gh-pages
Merge branch 'master' into gh-pages