scpmj function
Merge branch 'master' of https://github.com/mjemmeson/dot-files
tweaks
resolve conflict