Use filemerge
Add lolcommits fun
Clean up slate file
Better wording
Use gemset
zshrc updates