Merge remote-tracking branches 'spirit', 'crybaby' and 'staging'
[profile] / dot / shell-logout
2017-08-05 Mark Woodingdot/*: Major shake-up of shell configuration.