Merge branch 'master' of https://github.com/skwp/dotfiles
Merge branch 'master' of https://github.com/michaeljacobdavis/dotfiles
Removed trailing comma