Mostly Rd cleanup
Merge branch 'devel' of github.com:mrdwab/splitstackshape into devel