Merge individual files

Merged Robert Spencer requested to merge rspencer/awit-zsh-superawesome:merge-files into master Dec 04, 2019