Combine diffsource, source and confsource; default to '.'
Sort all but one of Matt's comments
Merge branch 'upstream/master' into simplify-stem
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 '.'